diff options
author | Han-Wen Nienhuys <hanwen@google.com> | 2020-08-21 19:59:35 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-21 21:20:10 +0300 |
commit | c8e4159efd226218d827b5da71fc8f95f8172412 (patch) | |
tree | 7db9b2330fd75041ed1559724ba9669b8511951f /path.c | |
parent | 3f9f1acccf32fb1feda0f7ea8533bed2b594b1a0 (diff) |
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.c')
-rw-r--r-- | path.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1528,7 +1528,6 @@ char *xdg_cache_home(const char *filename) return NULL; } -REPO_GIT_PATH_FUNC(cherry_pick_head, "CHERRY_PICK_HEAD") REPO_GIT_PATH_FUNC(revert_head, "REVERT_HEAD") REPO_GIT_PATH_FUNC(squash_msg, "SQUASH_MSG") REPO_GIT_PATH_FUNC(merge_msg, "MERGE_MSG") |