From: "Raymond E. Pasco" <ray@ameretat.dev>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Raymond E. Pasco" <ray@ameretat.dev>
Subject: [PATCH v5 3/3] t4140: test apply with i-t-a paths
Date: Sat, 8 Aug 2020 03:49:59 -0400 [thread overview]
Message-ID: <20200808074959.35943-4-ray@ameretat.dev> (raw)
In-Reply-To: <20200808074959.35943-1-ray@ameretat.dev>
apply --cached (as used by add -p) should accept creation and deletion
patches to intent-to-add paths in the index. apply --index, however,
should always fail because an intent-to-add path never matches the
worktree (by definition).
Based-on-patch-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Raymond E. Pasco <ray@ameretat.dev>
---
t/t4140-apply-ita.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100755 t/t4140-apply-ita.sh
diff --git a/t/t4140-apply-ita.sh b/t/t4140-apply-ita.sh
new file mode 100755
index 0000000000..c614eaf04c
--- /dev/null
+++ b/t/t4140-apply-ita.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+test_description='git apply of i-t-a file'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ test_write_lines 1 2 3 4 5 >blueprint &&
+
+ cat blueprint >test-file &&
+ git add -N test-file &&
+ git diff >creation-patch &&
+ grep "new file mode 100644" creation-patch &&
+
+ rm -f test-file &&
+ git diff >deletion-patch &&
+ grep "deleted file mode 100644" deletion-patch
+'
+
+test_expect_success 'apply creation patch to ita path (--cached)' '
+ git rm -f test-file &&
+ cat blueprint >test-file &&
+ git add -N test-file &&
+
+ git apply --cached creation-patch &&
+ git cat-file blob :test-file >actual &&
+ test_cmp blueprint actual
+'
+
+test_expect_success 'apply creation patch to ita path (--index)' '
+ git rm -f test-file &&
+ cat blueprint >test-file &&
+ git add -N test-file &&
+ rm -f test-file &&
+
+ test_must_fail git apply --index creation-patch
+'
+
+test_expect_success 'apply deletion patch to ita path (--cached)' '
+ git rm -f test-file &&
+ cat blueprint >test-file &&
+ git add -N test-file &&
+
+ git apply --cached deletion-patch &&
+ test_must_fail git ls-files --stage --error-unmatch test-file
+'
+
+test_expect_success 'apply deletion patch to ita path (--index)' '
+ cat blueprint >test-file &&
+ git add -N test-file &&
+
+ test_must_fail git apply --index deletion-patch &&
+ git ls-files --stage --error-unmatch test-file
+'
+
+test_done
--
2.28.0.5.gfc8e108108
next prev parent reply other threads:[~2020-08-08 7:50 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-04 16:33 [PATCH] apply: Allow "new file" patches on i-t-a entries Raymond E. Pasco
2020-08-04 19:30 ` Junio C Hamano
2020-08-04 20:59 ` Raymond E. Pasco
2020-08-04 22:31 ` [PATCH v2] apply: allow " Raymond E. Pasco
2020-08-04 23:40 ` [PATCH v3] " Raymond E. Pasco
2020-08-04 23:49 ` [PATCH v2] " Junio C Hamano
2020-08-05 0:32 ` Raymond E. Pasco
2020-08-06 6:01 ` [PATCH v4 0/3] apply: handle i-t-a entries in index Raymond E. Pasco
2020-08-06 6:01 ` [PATCH v4 1/3] apply: allow "new file" patches on i-t-a entries Raymond E. Pasco
2020-08-06 6:01 ` [PATCH v4 2/3] apply: make i-t-a entries never match worktree Raymond E. Pasco
2020-08-06 21:00 ` Junio C Hamano
2020-08-06 21:47 ` Raymond E. Pasco
2020-08-06 6:01 ` [PATCH v4 3/3] t4140: test apply with i-t-a paths Raymond E. Pasco
2020-08-06 21:07 ` Junio C Hamano
2020-08-07 3:44 ` Raymond E. Pasco
2020-08-08 7:49 ` [PATCH v5 0/3] apply: handle i-t-a entries in index Raymond E. Pasco
2020-08-08 7:49 ` [PATCH v5 1/3] apply: allow "new file" patches on i-t-a entries Raymond E. Pasco
2020-08-08 13:47 ` Phillip Wood
2020-08-08 7:49 ` [PATCH v5 2/3] apply: make i-t-a entries never match worktree Raymond E. Pasco
2020-08-08 13:46 ` Phillip Wood
2020-08-08 14:07 ` Raymond E. Pasco
2020-08-08 15:48 ` Phillip Wood
2020-08-08 15:58 ` Raymond E. Pasco
2020-08-09 15:25 ` Phillip Wood
2020-08-09 17:58 ` Junio C Hamano
2020-08-10 11:03 ` [PATCH] git-apply.txt: correct description of --cached Raymond E. Pasco
2020-08-10 16:18 ` Junio C Hamano
2020-08-12 13:32 ` Phillip Wood
2020-08-12 19:23 ` Junio C Hamano
2020-08-12 20:52 ` Raymond E. Pasco
2020-08-12 13:59 ` Phillip Wood
2020-08-08 7:49 ` Raymond E. Pasco [this message]
2020-08-23 15:58 ` [PATCH v5 3/3] t4140: test apply with i-t-a paths Phillip Wood
2020-08-08 7:53 ` [PATCH 1/1] diff-lib: use worktree mode in diffs from i-t-a entries Raymond E. Pasco
2020-08-08 8:48 ` Martin Ågren
2020-08-08 10:46 ` Raymond E. Pasco
2020-08-08 14:21 ` Martin Ågren
2020-08-09 18:09 ` Junio C Hamano
2020-08-10 8:53 ` [PATCH] t4069: test diff behavior with i-t-a paths Raymond E. Pasco
2020-08-10 8:57 ` [PATCH] diff-lib: use worktree mode in diffs from i-t-a entries Raymond E. Pasco
2020-08-10 9:03 ` [RESEND PATCH v2] " Raymond E. Pasco
2020-08-10 16:22 ` [PATCH] t4069: test diff behavior with i-t-a paths Junio C Hamano
2020-08-10 16:23 ` Eric Sunshine
2020-08-10 21:47 ` Eric Sunshine
2020-08-10 22:09 ` Junio C Hamano
2020-08-10 22:13 ` Eric Sunshine
2020-08-10 22:22 ` Junio C Hamano
2020-08-10 23:02 ` Raymond E. Pasco
2020-08-10 23:21 ` Eric Sunshine
2020-08-11 3:29 ` Junio C Hamano
2020-08-08 7:58 ` [HYPOTHETICAL PATCH 0/2] apply: reject modification diffs to i-t-a entries Raymond E. Pasco
2020-08-08 7:58 ` [HYPOTHETICAL PATCH 1/2] " Raymond E. Pasco
2020-08-08 7:58 ` [HYPOTHETICAL PATCH 2/2] t4140: test failure of diff from empty blob to i-t-a path Raymond E. Pasco
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200808074959.35943-4-ray@ameretat.dev \
--to=ray@ameretat.dev \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).