From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:40 +0000 (-0700)
Subject: Merge branch 'dd/diff-files-unmerged-fix' into maint
X-Git-Tag: v2.33.1~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=872c9e67ecf9ecb525e320e46171027c7742e76a;p=thirdparty%2Fgit.git

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

872c9e67ecf9ecb525e320e46171027c7742e76a