[PATCH] apply: Allow "new file" patches on i-t-a entries
From: Raymond E. Pasco <hidden>
Date: 2020-08-04 16:33:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
diff-files recently changed to treat "intent to add" entries as new file diffs rather than diffs from the empty blob. However, apply refuses to apply new file diffs on top of existing index entries, except in the case of renames. This causes "git add -p", which uses apply, to fail when attempting to stage hunks from a file when intent to add has been recorded. This adds an additional check to check_to_create() which tests if the CE_INTENT_TO_ADD flag is set on an existing index entry, and allows the apply to proceed if so. --- cf. [ref] apply.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/apply.c b/apply.c
index 8bff604dbe..b31bd0e866 100644
--- a/apply.c
+++ b/apply.c@@ -3747,10 +3747,20 @@ static int check_to_create(struct apply_state *state, { struct stat nst; - if (state->check_index && - index_name_pos(state->repo->index, new_name, strlen(new_name)) >= 0 && - !ok_if_exists) - return EXISTS_IN_INDEX; + if (state->check_index) { + struct cache_entry *ce = NULL; + int intent_to_add; + int pos = index_name_pos(state->repo->index, new_name, strlen(new_name)); + if (pos >= 0) + ce = state->repo->index->cache[pos]; + if (ce && (ce->ce_flags & CE_INTENT_TO_ADD)) + intent_to_add = 1; + else + intent_to_add = 0; + if (pos >= 0 && !intent_to_add && !ok_if_exists) + return EXISTS_IN_INDEX; + } + if (state->cached) return 0;
--
2.28.0