mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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
This commit is contained in:
commit
a2437297c9
|
@ -1327,7 +1327,6 @@ void print_commit_summary(struct repository *r,
|
||||||
get_commit_format(format.buf, &rev);
|
get_commit_format(format.buf, &rev);
|
||||||
rev.always_show_header = 0;
|
rev.always_show_header = 0;
|
||||||
rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
|
rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
|
||||||
rev.diffopt.break_opt = 0;
|
|
||||||
diff_setup_done(&rev.diffopt);
|
diff_setup_done(&rev.diffopt);
|
||||||
|
|
||||||
refs = get_main_ref_store(the_repository);
|
refs = get_main_ref_store(the_repository);
|
||||||
|
|
31
t/t7524-commit-summary.sh
Executable file
31
t/t7524-commit-summary.sh
Executable 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
|
Loading…
Reference in a new issue