[PATCH] diff: print line prefix for --name-only output
- From
Jeff King <peff@peff.net>
- Date
- Feb 8, 2017, 20:31 UTC
- Message-ID
- <20170208203115.4rrtk2vwixyvhhhl@sigill.intra.peff.net>
- In-Reply-To
- <CACsJy8BmxpTW5pCLNEQa9sm8teU0O+_Xu+td+uh1K0Bn=yu=yw@mail.gmail.com>
On Wed, Feb 08, 2017 at 01:24:34PM +0700, Duy Nguyen wrote:
Show 8 quoted lines
> On Wed, Feb 8, 2017 at 6:11 AM, Davide Del Vento <ddvento@ucar.edu> wrote: > > `git log --graph --name-only` works fine, but the name is not > > properly indented as it is for `git log --graph --name-status` > > > > I tested this in git v1.9.1 the only one I have access at the moment > > Confirmed still happens on master. --stat plays nicely with --graph > though, so it's probably just some small fixes somewhere in diff*.c.
Yep. Looks like every format except --name-only handles this correctly.
-- >8 -- Subject: diff: print line prefix for --name-only output
If you run "git log --graph --name-only", the pathnames are not indented to go along with their matching commits (unlike all of the other diff formats). We need to output the line prefix for each item before writing it.
The tests cover both --name-status and --name-only. The former actually gets this right already, because it builds on the --raw format functions. It's only --name-only which uses its own code (and this fix mirrors the code in diff_flush_raw()).
Note that the tests don't follow our usual style of setting up the "expect" output inside the test block. This matches the surrounding style, but more importantly it is easier to read: we don't have to worry about embedded single-quotes, and the leading indentation is more obvious.
Signed-off-by: Jeff King <peff@peff.net> --- diff.c | 1 + t/t4202-log.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+)
diff --git a/diff.c b/diff.c index d91a34490..a79f3408d 100644 --- a/diff.c +++ b/diff.c @@ -4450,6 +4450,7 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt) name_a = p->two->path; name_b = NULL; strip_prefix(opt->prefix_length, &name_a, &name_b); + fprintf(opt->file, "%s", diff_line_prefix(opt)); write_name_quoted(name_a, opt->file, opt->line_termination); } } diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 08ea725de..48b55bfd2 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1212,6 +1212,54 @@ test_expect_success 'log --line-prefix="*** " --graph with diff and stats' ' test_i18ncmp expect actual.sanitized ' +cat >expect <<-\EOF +* reach +| +| A reach.t +* Merge branch 'tangle' +* Merge branch 'side' +|\ +| * side-2 +| +| A 2 +* Second +| +| A one +* sixth + + D a/two +EOF + +test_expect_success 'log --graph with --name-status' ' + git log --graph --format=%s --name-status tangle..reach >actual && + sanitize_output <actual >actual.sanitized && + test_cmp expect actual.sanitized +' + +cat >expect <<-\EOF +* reach +| +| reach.t +* Merge branch 'tangle' +* Merge branch 'side' +|\ +| * side-2 +| +| 2 +* Second +| +| one +* sixth + + a/two +EOF + +test_expect_success 'log --graph with --name-only' ' + git log --graph --format=%s --name-only tangle..reach >actual && + sanitize_output <actual >actual.sanitized && + test_cmp expect actual.sanitized +' + test_expect_success 'dotdot is a parent directory' ' mkdir -p a/b && ( echo sixth && echo fifth ) >expect &&
-- 2.12.0.rc0.371.ga6cf8653b