]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7521-ignored-mode.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae9e6ef 8174627)
Merge branch 'dd/diff-files-unmerged-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:40 +0000 (13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 12 Oct 2021 20:51:40 +0000 (13:51 -0700)
commit872c9e67ecf9ecb525e320e46171027c7742e76a
tree7b95a402c0dd78cc2af69c7f619f9dc39363034btree | snapshot
parentae9e6ef35e1c09cb198dcd7b22287c42728663e7commit | diff
parent8174627b3d32dc80cb477b3fa46971955f26c6b2commit | diff
Merge branch 'dd/diff-files-unmerged-fix' into maint

"git diff --relative" segfaulted and/or produced incorrect result
when there are unmerged paths.

* dd/diff-files-unmerged-fix:
  diff-lib: ignore paths that are outside $cwd if --relative asked
diff-lib.c diff1 | diff2 | blob | history
t/t4045-diff-relative.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.