]> git.99rst.org Git - git.git/commit
git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7a403c3 447126e)
Merge branch 'jk/diff-relative-cached-unmerged'
authorJunio C Hamano <redacted>
Wed, 5 Aug 2026 18:10:50 +0000 (11:10 -0700)
committerJunio C Hamano <redacted>
Wed, 5 Aug 2026 18:10:51 +0000 (11:10 -0700)
commitf072d0e4a270c9e0afb0f02a1de37daf5a277138
tree64894c840f452744812b5eb14eaea65d5028f004tree
parent7a403c3ee5519770b2630b49a59eba7815c8c210commit | diff
parent447126ed7df66b396235766547a57649f925aac2commit | diff
Merge branch 'jk/diff-relative-cached-unmerged'

'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
diff-lib.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT