]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 85246a7 8174627)
Merge branch 'dd/diff-files-unmerged-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2021 20:30:31 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Sep 2021 20:30:31 +0000 (13:30 -0700)
commitc8f491668e46d66290aec97caaf94fe2c1ecccbd
treef2b793ddaf748fd0d11c2394d9fb24ecbd07d68atree | snapshot
parent85246a7054a6d20a1dc7ccc31e382493332374a4commit | diff
parent8174627b3d32dc80cb477b3fa46971955f26c6b2commit | diff
Merge branch 'dd/diff-files-unmerged-fix'

"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.