diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-13 14:44:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-13 14:44:48 -0800 |
| commit | 5071cb78a31b75e007b36f7edb4a4daa59cf3138 (patch) | |
| tree | 1549230b35a62441783453c114d5736ee56fe363 /diff.c | |
| parent | d982de5d32582bfebf30386468d43290efa258c5 (diff) | |
| parent | 85a9a63c9268b18b24f25f6a14d6ae9966c3566d (diff) | |
| download | git-5071cb78a31b75e007b36f7edb4a4daa59cf3138.tar.gz | |
Merge branch 'jk/diff-external-with-no-index' into maint-2.43
"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
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -4384,7 +4384,8 @@ static void run_external_diff(const char *pgm, add_external_diff_name(o->repo, &cmd.args, two); if (other) { strvec_push(&cmd.args, other); - strvec_push(&cmd.args, xfrm_msg); + if (xfrm_msg) + strvec_push(&cmd.args, xfrm_msg); } } |