diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-02-10 12:52:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-10 12:52:27 -0800 |
| commit | e53c7f8731f7fa66864397d3d1ec1ad7c035c23a (patch) | |
| tree | 57b415de5fbe8afd9649d592aa7af9cd10854caa /t | |
| parent | Merge branch 'da/t7800-cleanup' (diff) | |
| parent | diff: print line prefix for --name-only output (diff) | |
| download | tgif-e53c7f8731f7fa66864397d3d1ec1ad7c035c23a.tar.xz | |
Merge branch 'jk/log-graph-name-only'
"git log --graph" did not work well with "--name-only", even though
other forms of "diff" output were handled correctly.
* jk/log-graph-name-only:
diff: print line prefix for --name-only output
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4202-log.sh | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 08ea725de3..48b55bfd27 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 && |