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

Merge branch 'jk/diff-external-with-no-index' into maint-2.43

Browse Source 
"git diff --no-index file1 file2" segfaulted while invoking the
external diff driver, which has been corrected.

* jk/diff-external-with-no-index:
  diff: handle NULL meta-info when spawning external diff
This commit is contained in:
Junio C Hamano
2024-02-13 14:44:48 -08:00
parent d982de5d32 85a9a63c92
commit 5071cb78a3
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
diff.c
View File

@@ -4384,6 +4384,7 @@ static void run_external_diff(const char *pgm,
add_external_diff_name(o->repo, &cmd.args, two); add_external_diff_name(o->repo, &cmd.args, two);
if (other) { if (other) {
strvec_push(&cmd.args, other); strvec_push(&cmd.args, other);
if (xfrm_msg)
strvec_push(&cmd.args, xfrm_msg); strvec_push(&cmd.args, xfrm_msg);
} }
} }

12
t/t4053-diff-no-index.sh
View File

@@ -205,6 +205,18 @@ test_expect_success POSIXPERM,SYMLINKS 'diff --no-index normalizes: mode not lik
test_cmp expected actual test_cmp expected actual
' '
test_expect_success POSIXPERM 'external diff with mode-only change' '
echo content >not-executable &&
echo content >executable &&
chmod +x executable &&
echo executable executable $(test_oid zero) 100755 \
not-executable $(test_oid zero) 100644 not-executable \
>expect &&
test_expect_code 1 git -c diff.external=echo diff \
--no-index executable not-executable >actual &&
test_cmp expect actual
'
test_expect_success "diff --no-index treats '-' as stdin" ' test_expect_success "diff --no-index treats '-' as stdin" '
cat >expect <<-EOF && cat >expect <<-EOF &&
diff --git a/- b/a/1 diff --git a/- b/a/1