mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/diff-exit-code-binary'

Browse Source 
"git diff --exit-code" ignored modified binary files, which has
been corrected.

* rs/diff-exit-code-binary:
  diff: report modified binary files as changes in builtin_diff()
This commit is contained in:
Junio C Hamano
2024-09-25 18:24:51 -07:00
parent cd845c0422 9a41735af6
commit f92c61aef0
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
diff.c
View File

@ -3675,6 +3675,7 @@ static void builtin_diff(const char *name_a,
emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES, emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
sb.buf, sb.len, 0); sb.buf, sb.len, 0);
strbuf_release(&sb); strbuf_release(&sb);
o->found_changes = 1;
goto free_ab_and_return; goto free_ab_and_return;
} }
if (fill_mmfile(o->repo, &mf1, one) < 0 || if (fill_mmfile(o->repo, &mf1, one) < 0 ||

8
t/t4017-diff-retval.sh
View File

@ -145,6 +145,14 @@ test_expect_success 'option errors are not confused by --exit-code' '
for option in --exit-code --quiet for option in --exit-code --quiet
do do
test_expect_success "git diff $option returns 1 for changed binary file" "
test_when_finished 'rm -f .gitattributes' &&
git reset --hard &&
echo a binary >.gitattributes &&
echo 2 >>a &&
test_expect_code 1 git diff $option
"
test_expect_success "git diff $option returns 1 for copied file" " test_expect_success "git diff $option returns 1 for copied file" "
git reset --hard && git reset --hard &&
cp a copy && cp a copy &&