mbox series

[v4,0/3] apply: handle i-t-a entries in index

Message ID 20200806060119.74587-1-ray@ameretat.dev (mailing list archive)
Headers show
Series apply: handle i-t-a entries in index | expand

Message

Raymond E. Pasco Aug. 6, 2020, 6:01 a.m. UTC
I've finished this up and completed the tests as well. Just as
read-cache.c says, i-t-a entries should never match the worktree -
therefore, apply --index always fails.

Raymond E. Pasco (3):
  apply: allow "new file" patches on i-t-a entries
  apply: make i-t-a entries never match worktree
  t4140: test apply with i-t-a paths

 apply.c              | 26 ++++++++++++++++----
 t/t4140-apply-ita.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 t/t4140-apply-ita.sh