From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 25 Jul 2026 21:37:15 +0000 (-0700)
Subject: Merge branch 'jk/diff-relative-cached-unmerged' into next
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8829f9b348478812c34029cd2cefe9b18e241d31;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-relative-cached-unmerged' into next

'git diff --relative' running with '--cached' has been corrected to
avoid a segfault when encountering unmerged paths outside the
prefix.

* jk/diff-relative-cached-unmerged:
  diff: ignore unmerged paths outside prefix with --relative --cached
---

8829f9b348478812c34029cd2cefe9b18e241d31