From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 6 Feb 2024 22:31:20 +0000 (-0800)
Subject: Merge branch 'jk/diff-external-with-no-index'
X-Git-Tag: v2.44.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92e69dfb66fa5c760e2d1f76c8a21cdb6faacaee;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-external-with-no-index'

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

92e69dfb66fa5c760e2d1f76c8a21cdb6faacaee