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

7
path.h
View File

@ -170,7 +170,6 @@ void report_linked_checkout_garbage(void);
}
struct path_cache {
const char *cherry_pick_head;
const char *revert_head;
const char *squash_msg;
const char *merge_msg;
@ -182,9 +181,11 @@ struct path_cache {
const char *shallow;
};
#define PATH_CACHE_INIT { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
#define PATH_CACHE_INIT \
{ \
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \
}
const char *git_path_cherry_pick_head(struct repository *r);
const char *git_path_revert_head(struct repository *r);
const char *git_path_squash_msg(struct repository *r);
const char *git_path_merge_msg(struct repository *r);