admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs: convert MERGE_AUTOSTASH to become a normal pseudo-ref

Browse Source 
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>
This commit is contained in:
Patrick Steinhardt
2024-01-19 11:40:19 +01:00
committed by Junio C Hamano
parent 35122daebc
commit 3f921c7591
8 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
branch.c
View File

@@ -819,7 +819,7 @@ void remove_merge_branch_state(struct repository *r)
unlink(git_path_merge_mode(r));
refs_delete_ref(get_main_ref_store(r), "", "AUTO_MERGE",
NULL, REF_NO_DEREF);
save_autostash(git_path_merge_autostash(r));
save_autostash_ref(r, "MERGE_AUTOSTASH");
}
void remove_branch_state(struct repository *r, int verbose)