From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Jul 2026 19:15:02 +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=1ac873b5f9a608a631e1ed27ac2ea37f911c1b79;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-lib: add idx/tree sanity check to oneway_diff
---

1ac873b5f9a608a631e1ed27ac2ea37f911c1b79