Re: [BUG] log --graph corrupts patch

From: Jeff King <peff@peff.net>
Date: Mar 20, 2018, 06:09 UTC
Message-ID: <20180320060931.GE15813@sigill.intra.peff.net>
In-Reply-To: <897b7471-037a-78d9-fc11-0624ef657b4d@talktalk.net>

On Mon, Mar 19, 2018 at 10:21:56AM +0000, Phillip Wood wrote:

Show 19 quoted lines

> I've just been reviewing some patches with 'git log --graph --patch' and
> came across what looked like a bug:
> 
> | @@ -272,6 +272,9 @@ do
> |       --keep-empty)
> |               keep_empty=yes
> |               ;;
> |       --allow-empty-message)
> | +     --no-keep-empty)
> | +             keep_empty=
> | +             ;;
> |               allow_empty_message=--allow-empty-message
> |               ;;
> 
> However when I looked at the file it was fine, "--allow-empty-message)"
> was actually below the insertions. 'git log --patch' gives the correct
> patch:
> [...]
> git fetch https://github.com/phillipwood/git.git log-graph-breaks-patch

That's really strange. I can't seem to replicate it here, though; it looks correct with our without --graph. Knowing how the graph code is implemented, it seems like an unlikely bug for us to output lines out of order (but of course anything's possible).

Are you using any exotic filters for your pager? If you use "git --no-pager" does the problem persist?

-Peff