summaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-06-08 14:27:52 -0700
committerJunio C Hamano <gitster@pobox.com>2022-06-08 14:27:52 -0700
commitac8f6b6608315ea11d64ba331ea39cf985f577f5 (patch)
treedc62f153ab0784667419e0fb950dcc760892fd48 /t
parenta5a52739e960d11560d841ed0756a7d90937903b (diff)
parent84792322ed9e79c3152d9443ab6609710db4b26a (diff)
downloadgit-ac8f6b6608315ea11d64ba331ea39cf985f577f5.tar.gz
git-ac8f6b6608315ea11d64ba331ea39cf985f577f5.zip
Merge branch 'rs/commit-summary-wo-break-rewrite' into maint
The commit summary shown after making a commit is matched to what is given in "git status" not to use the break-rewrite heuristics. source: <c35bd0aa-2e46-e710-2b39-89f18bad0097@web.de> * rs/commit-summary-wo-break-rewrite: commit, sequencer: turn off break_opt for commit summary
Diffstat (limited to 't')
-rwxr-xr-xt/t7524-commit-summary.sh31
1 files changed, 31 insertions, 0 deletions
diff --git a/t/t7524-commit-summary.sh b/t/t7524-commit-summary.sh
new file mode 100755
index 0000000000..47b2f1dc22
--- /dev/null
+++ b/t/t7524-commit-summary.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+test_description='git commit summary'
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ test_seq 101 200 >file &&
+ git add file &&
+ git commit -m initial &&
+ git tag initial
+'
+
+test_expect_success 'commit summary ignores rewrites' '
+ git reset --hard initial &&
+ test_seq 200 300 >file &&
+
+ git diff --stat >diffstat &&
+ git diff --stat --break-rewrites >diffstatrewrite &&
+
+ # make sure this scenario is a detectable rewrite
+ ! test_cmp_bin diffstat diffstatrewrite &&
+
+ git add file &&
+ git commit -m second >actual &&
+
+ grep "1 file" <actual >actual.total &&
+ grep "1 file" <diffstat >diffstat.total &&
+ test_cmp diffstat.total actual.total
+'
+
+test_done