averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/diff-quiet-no-rename'

Browse Source 
As "git diff --quiet" only cares about the existence of any
changes, disable rename/copy detection to skip more expensive
processing whose result will be discarded anyway.

* rs/diff-quiet-no-rename:
  diff: disable rename detection with --quiet
This commit is contained in:
Junio C Hamano
2025-11-21 09:14:15 -08:00
parent 5e6e4854e0 fa052367ef
commit 3176576a56
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@@ -4987,6 +4987,8 @@ void diff_setup_done(struct diff_options *options)
if (options->flags.quick) { if (options->flags.quick) {
options->output_format = DIFF_FORMAT_NO_OUTPUT; options->output_format = DIFF_FORMAT_NO_OUTPUT;
options->flags.exit_with_status = 1; options->flags.exit_with_status = 1;
options->detect_rename = 0;
options->flags.find_copies_harder = 0;
} }
/* /*

10
t/t4007-rename-3.sh
View File

@@ -41,6 +41,16 @@ test_expect_success 'copy detection, cached' '
compare_diff_raw current expected compare_diff_raw current expected
' '
test_expect_success 'exit code of quiet copy detection' '
test_expect_code 1 \
git diff --quiet --cached --find-copies-harder $tree
'
test_expect_success 'exit code of quiet copy detection with --no-ext-diff' '
test_expect_code 1 \
git diff --quiet --cached --find-copies-harder --no-ext-diff $tree
'
# In the tree, there is only path0/COPYING. In the cache, path0 and # In the tree, there is only path0/COPYING. In the cache, path0 and
# path1 both have COPYING and the latter is a copy of path0/COPYING. # path1 both have COPYING and the latter is a copy of path0/COPYING.
# However when we say we care only about path1, we should just see # However when we say we care only about path1, we should just see