From b8825ef233840136bd01a9619b36af515f498eb2 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 21 Aug 2020 16:59:37 +0000 Subject: sequencer: treat REVERT_HEAD as a pseudo ref Signed-off-by: Han-Wen Nienhuys Signed-off-by: Junio C Hamano --- path.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'path.h') diff --git a/path.h b/path.h index 8941c018a9..e7e77da6aa 100644 --- a/path.h +++ b/path.h @@ -170,7 +170,6 @@ void report_linked_checkout_garbage(void); } struct path_cache { - const char *revert_head; const char *squash_msg; const char *merge_msg; const char *merge_rr; @@ -181,12 +180,11 @@ struct path_cache { const char *shallow; }; -#define PATH_CACHE_INIT \ - { \ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \ +#define PATH_CACHE_INIT \ + { \ + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \ } -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); const char *git_path_merge_rr(struct repository *r); -- cgit v1.2.3