From: Phillip Wood <phillip.wood123@gmail.com>
To: "Raymond E. Pasco" <ray@ameretat.dev>,
phillip.wood@dunelm.org.uk, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v5 2/3] apply: make i-t-a entries never match worktree
Date: Sun, 9 Aug 2020 16:25:04 +0100 [thread overview]
Message-ID: <e52f7048-45ab-1f5e-1b04-30bd9b98d9b2@gmail.com> (raw)
In-Reply-To: <C4RQMTXM9R7C.1WK5637SFISUU@ziyou.local>
Hi Raymond
On 08/08/2020 16:58, Raymond E. Pasco wrote:
> On Sat Aug 8, 2020 at 11:48 AM EDT, Phillip Wood wrote:
>> If I've understood correctly an i-t-a entry in the index combined with
>> nothing in the worktree is a deletion and that is why we don't want
>> --index to succeed when applying a creation patch? If so an expanded
>> explanation in the commit message to this patch would help rather than
>> just saying 'by definition'. I'm still a bit confused as we don't count
>> it as a deletion when using --cached or applying to the worktree.
>
> Nothing that complicated - --index requires that the index and worktree
> be identical, and nothing that can possibly be in a worktree is
> identical to an i-t-a entry.
Oh, so --index requires the index and worktree to match and the worktree
cannot represent i-t-a so they don't match. I'm still not totally
convinced that it is useful to prevent a creation patch from applying
when the path is missing from the worktree but is marked as i-t-a in the
index but I guess it matches the behavior the general behavior where a
patch can be successfully applied with 'apply' and 'apply --cached' but
not with 'apply --index'
>>> --check goes through all the same code,
>>
>> The same code as --cached or --index? (I assume it's the former but
>> wanted to be sure)
>
> "--cached --check" goes through the same code paths as "--cached",
> "--cached --index" goes through the same code paths as "--index",
> "--check" goes through the same code paths as [no options]. The option
> just makes it skip the part where it writes things out.
Thanks for clarifying that
Best Wishes
Phillip
next prev parent reply other threads:[~2020-08-09 15:25 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 [this message]
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=e52f7048-45ab-1f5e-1b04-30bd9b98d9b2@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=ray@ameretat.dev \
/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).