diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-05-11 20:56:22 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-05-11 20:56:23 (GMT) |
commit | a2437297c9f964ec36bf6596dcc3ec275b7cdb4b (patch) | |
tree | 8adc9a5e340856617b1bd7bd97b392537e61a16e /t | |
parent | cacfd1d018125ee0450d06348bc4a6974f2c4d30 (diff) | |
parent | 84792322ed9e79c3152d9443ab6609710db4b26a (diff) | |
download | git-a2437297c9f964ec36bf6596dcc3ec275b7cdb4b.zip git-a2437297c9f964ec36bf6596dcc3ec275b7cdb4b.tar.gz git-a2437297c9f964ec36bf6596dcc3ec275b7cdb4b.tar.bz2 |
Merge branch 'rs/commit-summary-wo-break-rewrite'
The commit summary shown after making a commit is matched to what
is given in "git status" not to use the break-rewrite heuristics.
* rs/commit-summary-wo-break-rewrite:
commit, sequencer: turn off break_opt for commit summary
Diffstat (limited to 't')
-rwxr-xr-x | t/t7524-commit-summary.sh | 31 |
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 0000000..47b2f1d --- /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 |