From: Jeff King <peff@peff.net>
To: phillip.wood@dunelm.org.uk
Cc: Brian Henderson <henderson.bj@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [BUG] log --graph corrupts patch
Date: Tue, 20 Mar 2018 11:58:14 -0400 [thread overview]
Message-ID: <20180320155814.GA32366@sigill.intra.peff.net> (raw)
In-Reply-To: <1e686ea0-90ac-f3f4-7bcf-6951c9253598@talktalk.net>
On Tue, Mar 20, 2018 at 09:58:14AM +0000, Phillip Wood wrote:
> > 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.
Heh. Lucky guess. Unsurprisingly, I use diff-highlight, too. But I did
not see it because I never bothered to upgrade my personal copy of the
script, which has been working for me for ages, to the one in contrib/.
But indeed, I can easily reproduce the problem with that version of the
script. Here's a pretty minimal reproduction:
-- >8 --
cat >bad <<\EOF
* commit whatever
| other stuff irrelevant
|
| diff --git a/foo b/foo
| --- a/foo
| --- b/foo
| @@ -100,6 +100,9
| some
| context
| lines
| +some
| +new
| +lines
| -context line with a leading minus
| and other
| context
EOF
contrib/diff-highlight/diff-highlight <bad
-- 8< --
which produce:
...
| -context line with a leading minus
| +some
| +new
| +lines
...
The issue bisects to 7e4ffb4c17 (diff-highlight: add support for --graph
output, 2016-08-29). I think the problem is the "\s+" at the end of the
$GRAPH regex, which soaks up the space for the context, and accidentally
treats the "-" line as a preimage removal.
But just switching that to "\s" doesn't quite work. We may have an
arbitrary number of spaces between the graph ascii-art and the diff.
E.g., if you have a commit at the base of a branch (the test in
contrib/diff-highlight shows this case).
So I think you'd have to record the indent of the previous hunk header,
and then make sure that the indent matched that. But even there, I think
we're subject to false positives if a commit message contains a hunk
header (it's indented an extra 4 characters, but we'd accidentally soak
that up thinking it was graph indentation).
To make it bullet-proof, I think we'd have to actually parse the graph
structure, finding a "*" line and then accepting only an indent that
matched it.
-Peff
next prev parent reply other threads:[~2018-03-20 15:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 10:21 [BUG] log --graph corrupts patch Phillip Wood
2018-03-20 6:09 ` Jeff King
2018-03-20 9:58 ` Phillip Wood
2018-03-20 15:58 ` Jeff King [this message]
2018-03-21 5:47 ` Jeff King
2018-03-21 5:47 ` [PATCH 1/7] diff-highlight: correct test graph diagram Jeff King
2018-03-21 5:48 ` [PATCH 2/7] diff-highlight: use test_tick in graph test Jeff King
2018-03-21 5:48 ` [PATCH 3/7] diff-highlight: prefer "echo" to "cat" in tests Jeff King
2018-03-21 5:49 ` [PATCH 4/7] diff-highlight: test interleaved parallel lines of history Jeff King
2018-03-21 5:49 ` [PATCH 5/7] diff-highlight: test graphs with --color Jeff King
2018-03-21 5:56 ` [PATCH 6/7] diff-highlight: use flush() helper consistently Jeff King
2018-03-21 5:59 ` [PATCH 7/7] diff-highlight: detect --graph by indent Jeff King
2018-03-22 10:59 ` Phillip Wood
2018-03-22 11:18 ` Jeff King
2018-03-21 17:23 ` [BUG] log --graph corrupts patch Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180320155814.GA32366@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=henderson.bj@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).