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

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

'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-lib: add idx/tree sanity check to oneway_diff
  diff: ignore unmerged paths outside prefix with --relative --cached
---

dccc307679c7427982bc31aa9ff4741fc8df0637