| commit | 5071cb78a31b75e007b36f7edb4a4daa59cf3138 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Feb 2024 22:44:48 +0000 (13 14:44 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Feb 2024 22:44:48 +0000 (13 14:44 -0800) | ||
| tree | 1549230b35a62441783453c114d5736ee56fe363 | treesnapshot (tar.gz zip) |
| parent | d982de5d32582bfebf30386468d43290efa258c5 | commitdiff |
| parent | 85a9a63c9268b18b24f25f6a14d6ae9966c3566d | commitdiff |
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
"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
| diff.c | diff1 | diff2 | blobhistory |