aboutsummaryrefslogtreecommitdiffstats
path: root/refs.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-01-19 11:40:19 +0100
committerJunio C Hamano <gitster@pobox.com>2024-01-19 11:10:41 -0800
commit3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4 (patch)
tree0b8f82e7ae8325cbb8d7795853d799792520a7b9 /refs.c
parent35122daebc8030ccc42f54fe4f08272091e4aa94 (diff)
downloadgit-3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4.tar.gz
refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref
Similar to the preceding conversion of the AUTO_MERGE pseudo-ref, let's convert the MERGE_AUTOSTASH ref to become a normal pseudo-ref as well. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 906c7e5f27..047c81b1c1 100644
--- a/refs.c
+++ b/refs.c
@@ -1875,7 +1875,6 @@ static int is_special_ref(const char *refname)
*/
static const char * const special_refs[] = {
"FETCH_HEAD",
- "MERGE_AUTOSTASH",
"MERGE_HEAD",
};
size_t i;