[FFmpeg-devel] [RFC] gitlog merges

[Michael Niedermayer]

Hi jb, thresh

ive attached a simple patch which should make merges reviewable on
the maiing list
if you agree with the change, please apply
if you see a problem or if it misbehaves then dont hesitate to revert

i have locally tested it on a few commits and it added usefull
diffs to merges while leaving other changes as they where but i only
lightly tested

Thanks

On Mon, Feb 22, 2016 at 03:02:12PM +0100, Michael Niedermayer wrote:
> 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



> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Let us carefully observe those good qualities wherein our enemies excel us
and endeavor to excel them, by avoiding what is faulty, and imitating what
is excellent in them. -- Plutarch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ffmpeg-git-notify-Display-diffs-for-merges-to-allow-.patch
Type: text/x-patch
Size: 1802 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160224/7e4d4ff5/attachment.bin>
-------------- 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/20160224/7e4d4ff5/attachment.sig>