]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d982de5 85a9a63)
Merge branch 'jk/diff-external-with-no-index' into maint-2.43
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2024 22:44:48 +0000 (14:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Feb 2024 22:44:48 +0000 (14:44 -0800)
commit5071cb78a31b75e007b36f7edb4a4daa59cf3138
tree1549230b35a62441783453c114d5736ee56fe363tree | snapshot
parentd982de5d32582bfebf30386468d43290efa258c5commit | diff
parent85a9a63c9268b18b24f25f6a14d6ae9966c3566dcommit | diff
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
diff.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.