[FFmpeg-devel] [RFC] gitlog merges

[Michael Niedermayer]

On Thu, Feb 18, 2016 at 03:06:33AM +0100, Michael Niedermayer wrote:
> Hi
> 
> currently merges on the ML do not contain any diff
> should this be changed ?
> 
> what diff command makes most sense ?
> git log -p --first-parent -1 -m -M -C --patience
> 
> jb, (in CC), would it be possible for us to edit the script which
> creates the git log mails for ffmpeg so the changes due to merges can
> be reviewed by anyone interrested on the ML ?
> (that is obtain the current script and provide a patch or something
>  like that)
> in case people want to change this

Heres a suggested patch, note! iam not a perl developer
comments, review and testing welcome

Iam not sure iam supposed to share the original script from vlc
as i was sent a link privately, but various versions of the script
can be found by searching for
'"Tool to send git commit notifications"'


@@ -242,14 +242,23 @@ sub send_commit_notice($$)
         "---",
         "";

-        open STAT, "-|" or exec "git", "diff-tree", "--stat", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree";
+        open STAT, "-|" or exec "git", "diff-tree", "--stat", "-M", "-m", "--first-parent", "--no-commit-id", $obj or die "cannot exec git-diff-tree";
         push @notice, join("", <STAT>);
         close STAT;

-        open DIFF, "-|" or exec "git", "diff-tree", "-p", "-M", "--no-commit-id", $obj or die "cannot exec git-diff-tree";
+        open DIFF, "-|" or exec "git", "diff-tree", "-p", "-M", "-m", "--first-parent", "--no-commit-id", $obj or die "cannot exec git-diff-tree";
         my $diff = join( "", <DIFF> );
         close DIFF;

+        open DIFF, "-|" or exec "git", "diff-tree", "-p", "-M", "-m", "--cc", "--no-commit-id", $obj or die "cannot exec git-diff-tree";
+        my $diffcc = join( "", <DIFF> );
+        close DIFF;
+
+        if ($diff ne $diffcc)
+        {
+            $diff = join "\n\n======================================================================\n\n", $diff, $diffcc
+        }
+
         if (($max_diff_size == -1) || (length($diff) < $max_diff_size))
         {
             push @notice, $diff;

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

In a rich man's house there is no place to spit but his face.
-- Diogenes of Sinope
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160222/3f0833ba/attachment.sig>