summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-09-25 18:24:51 -0700
committerJunio C Hamano <gitster@pobox.com>2024-09-25 18:24:52 -0700
commitf92c61aef0190641e01294dad3b891b28113e1d5 (patch)
tree9654a55d7427cf8e609c446336165818aa5be75c /diff.c
parentcd845c04224f203f614618a72843f24645accda3 (diff)
parent9a41735af66dba1b677a8e88e7c2bc2f831bf6d2 (diff)
Merge branch 'rs/diff-exit-code-binary'
"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()
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 3be927b073..84a6bb0868 100644
--- a/diff.c
+++ b/diff.c
@@ -3675,6 +3675,7 @@ static void builtin_diff(const char *name_a,
emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
sb.buf, sb.len, 0);
strbuf_release(&sb);
+ o->found_changes = 1;
goto free_ab_and_return;
}
if (fill_mmfile(o->repo, &mf1, one) < 0 ||