summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-28 22:50:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-28 22:50:08 (GMT)
commit93d1f196a9b84f449ed405fe9c9c96320b6dffb0 (patch)
tree7908322dd12923c4261174bcfd3f2dd7c319e7ed /t
parent5a96715eb7451e81b3d981f2b4797a1aa4f1afdd (diff)
parent8d1675eb7f7f76af834c72e72c8824410e874fec (diff)
downloadgit-93d1f196a9b84f449ed405fe9c9c96320b6dffb0.zip
git-93d1f196a9b84f449ed405fe9c9c96320b6dffb0.tar.gz
git-93d1f196a9b84f449ed405fe9c9c96320b6dffb0.tar.bz2
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-xt/t3206-range-diff.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index bd808f8..e024cff 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 &&