diff options
| author | Han-Wen Nienhuys <hanwen@google.com> | 2020-08-21 16:59:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-21 18:20:10 (GMT) |
| commit | c8e4159efd226218d827b5da71fc8f95f8172412 (patch) | |
| tree | 7db9b2330fd75041ed1559724ba9669b8511951f /path.h | |
| parent | 3f9f1acccf32fb1feda0f7ea8533bed2b594b1a0 (diff) | |
| download | git-c8e4159efd226218d827b5da71fc8f95f8172412.zip git-c8e4159efd226218d827b5da71fc8f95f8172412.tar.gz git-c8e4159efd226218d827b5da71fc8f95f8172412.tar.bz2 | |
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 <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'path.h')
| -rw-r--r-- | path.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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); |