Re: [BUG] log --graph corrupts patch
- From
- Phillip Wood <phillip.wood@talktalk.net>
- Date
- Mar 20, 2018, 09:58 UTC
- Message-ID
- <1e686ea0-90ac-f3f4-7bcf-6951c9253598@talktalk.net>
- In-Reply-To
- <20180320060931.GE15813@sigill.intra.peff.net>
On 20/03/18 06:09, Jeff King wrote:
Show 29 quoted lines
> On Mon, Mar 19, 2018 at 10:21:56AM +0000, Phillip Wood wrote: > >> 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?
Hi Peff, thanks for taking the time to check this, I had forgotten about the pager. I'm using diff-highlight and it seems that is causing the problems.
Thanks again
Phillip
> -Peff >