From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Aug 2020 00:02:46 +0000 (-0700)
Subject: Merge branch 'rp/apply-cached-with-i-t-a'
X-Git-Tag: v2.29.0-rc0~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca81676a105dbd387c28fbcc428e8959990678ec;p=thirdparty%2Fgit.git

Merge branch 'rp/apply-cached-with-i-t-a'

Recent versions of "git diff-files" shows a diff between the index
and the working tree for "intent-to-add" paths as a "new file"
patch; "git apply --cached" should be able to take "git diff-files"
and should act as an equivalent to "git add" for the path, but the
command failed to do so for such a path.

* rp/apply-cached-with-i-t-a:
  t4140: test apply with i-t-a paths
  apply: make i-t-a entries never match worktree
  apply: allow "new file" patches on i-t-a entries
---

ca81676a105dbd387c28fbcc428e8959990678ec