From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 13 Feb 2024 22:44:48 +0000 (-0800)
Subject: Merge branch 'jk/diff-external-with-no-index' into maint-2.43
X-Git-Tag: v2.43.2~16
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5071cb78a31b75e007b36f7edb4a4daa59cf3138;p=thirdparty%2Fgit.git

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
---

5071cb78a31b75e007b36f7edb4a4daa59cf3138