diff options
| author |  Raymond E. Pasco <ray@ameretat.dev> | 2020-08-08 03:49:58 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-08-09 11:00:46 -0700 |
| commit | e3cc41b4f939a64c74b6d4a2d59f6efe006c4e4b (patch) | |
| tree | 0f4aaaf7bead8881281c2746e94f36693ced8379 /builtin/rebase.c | |
| parent | apply: allow "new file" patches on i-t-a entries (diff) | |
| download | tgif-e3cc41b4f939a64c74b6d4a2d59f6efe006c4e4b.tar.xz | |
apply: make i-t-a entries never match worktree
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
0 files changed, 0 insertions, 0 deletions