diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:08 -0700 |
| commit | 93d1f196a9b84f449ed405fe9c9c96320b6dffb0 (patch) | |
| tree | 7908322dd12923c4261174bcfd3f2dd7c319e7ed /t | |
| parent | Merge branch 'tb/diff-tree-with-notes' (diff) | |
| parent | range-diff: avoid negative string precision (diff) | |
| download | tgif-93d1f196a9b84f449ed405fe9c9c96320b6dffb0.tar.xz | |
Merge branch 'vd/range-diff-with-custom-pretty-format-fix'
"git range-diff" fixes.
* vd/range-diff-with-custom-pretty-format-fix:
range-diff: avoid negative string precision
range-diff: fix a crash in parsing git-log output
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3206-range-diff.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index bd808f87ed..e024cff65c 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -513,6 +513,16 @@ test_expect_success 'range-diff overrides diff.noprefix internally' ' git -c diff.noprefix=true range-diff HEAD^... ' +test_expect_success 'basic with modified format.pretty with suffix' ' + git -c format.pretty="format:commit %H%d%n" range-diff \ + master..topic master..unmodified +' + +test_expect_success 'basic with modified format.pretty without "commit "' ' + git -c format.pretty="format:%H%n" range-diff \ + master..topic master..unmodified +' + test_expect_success 'range-diff compares notes by default' ' git notes add -m "topic note" topic && git notes add -m "unmodified note" unmodified && |