From: "Raymond E. Pasco" <ray@ameretat.dev> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, "Raymond E. Pasco" <ray@ameretat.dev> Subject: [PATCH v4 2/3] apply: make i-t-a entries never match worktree Date: Thu, 6 Aug 2020 02:01:18 -0400 [thread overview] Message-ID: <20200806060119.74587-3-ray@ameretat.dev> (raw) In-Reply-To: <20200806060119.74587-1-ray@ameretat.dev> By definition, an intent-to-add index entry can never match the worktree, because worktrees have no concept of intent-to-add entries. Therefore, "apply --index" should always fail on intent-to-add paths. Because check_preimage() calls verify_index_match(), it already fails for patches other than creation patches, which check_preimage() ignores. This patch adds a check to check_preimage()'s rough equivalent for creation patches, check_to_create(). Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Raymond E. Pasco <ray@ameretat.dev> --- apply.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/apply.c b/apply.c index 4cba4ce71a..6328591489 100644 --- a/apply.c +++ b/apply.c @@ -3754,6 +3754,21 @@ static int check_to_create(struct apply_state *state, return EXISTS_IN_INDEX; } + /* If the new path to be added has an intent-to-add entry, then + * by definition it does not match what is in the work tree. So + * "apply --index" should always fail in this case. Patches other + * than creation patches are already held to this standard by + * check_preimage() calling verify_index_match(). + */ + if (state->check_index && !state->cached) { + int pos = index_name_pos(state->repo->index, new_name, + strlen(new_name)); + if (pos >= 0 && + state->repo->index->cache[pos]->ce_flags & CE_INTENT_TO_ADD) + return error(_("%s: does not match index"), new_name); + } + + if (state->cached) return 0; -- 2.28.0.2.g72bf77540a.dirty
next prev parent reply other threads:[~2020-08-06 6:02 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 ` Raymond E. Pasco [this message] 2020-08-06 21:00 ` [PATCH v4 2/3] apply: make i-t-a entries never match worktree 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 ` [PATCH v5 3/3] t4140: test apply with i-t-a paths Raymond E. Pasco 2020-08-23 15:58 ` 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=20200806060119.74587-3-ray@ameretat.dev \ --to=ray@ameretat.dev \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --subject='Re: [PATCH v4 2/3] apply: make i-t-a entries never match worktree' \ /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
Code repositories for project(s) associated with this 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).