]> git.ipfire.org Git - thirdparty/git.git/commit - wt-status.c
sequencer: treat CHERRY_PICK_HEAD as a pseudo ref
authorHan-Wen Nienhuys <hanwen@google.com>
Fri, 21 Aug 2020 16:59:35 +0000 (16:59 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Aug 2020 18:20:10 +0000 (11:20 -0700)
commitc8e4159efd226218d827b5da71fc8f95f8172412
tree7db9b2330fd75041ed1559724ba9669b8511951f
parent3f9f1acccf32fb1feda0f7ea8533bed2b594b1a0
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>
builtin/merge.c
path.c
path.h
sequencer.c
wt-status.c