diff options
| author | Han-Wen Nienhuys <hanwen@google.com> | 2020-08-21 16:59:37 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-21 11:20:11 -0700 |
| commit | b8825ef233840136bd01a9619b36af515f498eb2 (patch) | |
| tree | 991fe1afc6d7c5d1eaffb83e5f882ba54b97f24c /path.h | |
| parent | b6d2558c9ea37382078635022f8932565bea8ca1 (diff) | |
sequencer: treat REVERT_HEAD as a pseudo ref
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'path.h')
| -rw-r--r-- | path.h | 8 |
1 files changed, 3 insertions, 5 deletions
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); |