From c8e4159efd226218d827b5da71fc8f95f8172412 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 21 Aug 2020 16:59:35 +0000 Subject: sequencer: treat CHERRY_PICK_HEAD as a pseudo ref 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 Signed-off-by: Junio C Hamano --- path.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'path.h') diff --git a/path.h b/path.h index 1f1bf8f87a..8941c018a9 100644 --- a/path.h +++ b/path.h @@ -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); -- cgit v1.3-5-g9baa