undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit, sequencer: turn off break_opt for commit summary

Browse Source 
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>
This commit is contained in:
René Scharfe 2022-04-04 23:08:26 +02:00 committed by Junio C Hamano
parent 4c53a8c20f
commit 84792322ed
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sequencer.c
View File

@ -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);

31
t/t7524-commit-summary.sh Executable file
View File

@ -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