mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

apply: allow "new file" patches on i-t-a entries

Browse Source 
diff-files recently changed to treat changes to paths marked "intent to
add" in the index 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 changes the logic in check_to_create() which checks if an entry
already exists in an index in two ways: first, we only search for an
index entry at all if ok_if_exists is false; second, we check for the
CE_INTENT_TO_ADD flag on any index entries we find and allow the apply
to proceed if it is set.

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>
This commit is contained in:
Raymond E. Pasco 2020-08-06 02:01:17 -04:00 committed by Junio C Hamano
parent feea6946a5
commit 7cfde3fa0f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apply.c
View File

@ -3747,10 +3747,13 @@ static int check_to_create(struct apply_state *state,
{ {
struct stat nst; struct stat nst;
if (state->check_index && if (state->check_index && !ok_if_exists) {
index_name_pos(state->repo->index, new_name, strlen(new_name)) >= 0 && int pos = index_name_pos(state->repo->index, new_name, strlen(new_name));
!ok_if_exists) if (pos >= 0 &&
!(state->repo->index->cache[pos]->ce_flags & CE_INTENT_TO_ADD))
return EXISTS_IN_INDEX; return EXISTS_IN_INDEX;
}
if (state->cached) if (state->cached)
return 0; return 0;