]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aea8c58 447126e)
Merge branch 'jk/diff-relative-cached-unmerged' into jch
authorJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:03 +0000 (08:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 31 Jul 2026 15:54:03 +0000 (08:54 -0700)
commitdccc307679c7427982bc31aa9ff4741fc8df0637
tree38d29d64d9e9317ff71907116f43a04073880723tree | snapshot
parentaea8c58e71edacfefad29e94ca796176944e3f76commit | diff
parent447126ed7df66b396235766547a57649f925aac2commit | diff
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
diff-lib.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.