From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Aug 2020 23:14:44 +0000 (-0700)
Subject: Merge branch 'rp/ita-diff-modefix'
X-Git-Tag: v2.29.0-rc0~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b10a44e6b69509a09aaa51c8aa6379ab3ca4f3d7;p=thirdparty%2Fgit.git

Merge branch 'rp/ita-diff-modefix'

"git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
bit was not showing the mode bits from the working tree.

* rp/ita-diff-modefix:
  diff-lib: use worktree mode in diffs from i-t-a entries
---

b10a44e6b69509a09aaa51c8aa6379ab3ca4f3d7