diff options
| author | René Scharfe <l.s.r@web.de> | 2022-04-04 23:08:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-04-06 07:56:21 -0700 |
| commit | 84792322ed9e79c3152d9443ab6609710db4b26a (patch) | |
| tree | 66a6a015f03c83b38567809fb3a66de46bf8f37a | |
| parent | 4c53a8c20f8984adb226293a3ffd7b88c3f4ac1a (diff) | |
| download | git-84792322ed9e79c3152d9443ab6609710db4b26a.tar.xz | |
commit, sequencer: turn off break_opt for commit summary
dc6b1d92ca (wt-status: use settings from git_diff_ui_config, 2018-05-04)
disabled diffopt.break_opt for diffstats shown by git status and in
commit templates. For git status there isn't even a way to enable it.
Make the commit summary (shown after the commit) consistent by disabling
it there as well.
Reported-by: Laurent Lyaudet <laurent.lyaudet@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sequencer.c | 1 | ||||
| -rwxr-xr-x | t/t7524-commit-summary.sh | 31 |
2 files changed, 31 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 5213d16e97..eee1464ecf 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1328,7 +1328,6 @@ void print_commit_summary(struct repository *r, get_commit_format(format.buf, &rev); rev.always_show_header = 0; rev.diffopt.detect_rename = DIFF_DETECT_RENAME; - rev.diffopt.break_opt = 0; diff_setup_done(&rev.diffopt); refs = get_main_ref_store(the_repository); 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 |