mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: treat CHERRY_PICK_HEAD as a pseudo ref

Browse Source 
Check for existence and delete CHERRY_PICK_HEAD through ref functions.
This will help cherry-pick work with alternate ref storage backends.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Han-Wen Nienhuys
2020-08-21 16:59:35 +00:00
committed by Junio C Hamano
parent 3f9f1acccf
commit c8e4159efd
5 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
path.c
View File

@ -1528,7 +1528,6 @@ char *xdg_cache_home(const char *filename)
return NULL;
}
REPO_GIT_PATH_FUNC(cherry_pick_head, "CHERRY_PICK_HEAD")
REPO_GIT_PATH_FUNC(revert_head, "REVERT_HEAD")
REPO_GIT_PATH_FUNC(squash_msg, "SQUASH_MSG")
REPO_GIT_PATH_FUNC(merge_msg, "MERGE_MSG")