diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-01-19 11:40:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-19 11:10:41 -0800 |
| commit | 3f921c75913a4ba7b73cb0d8ec05a2cf24d1f4d4 (patch) | |
| tree | 0b8f82e7ae8325cbb8d7795853d799792520a7b9 /branch.c | |
| parent | 35122daebc8030ccc42f54fe4f08272091e4aa94 (diff) | |
| download | git-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 'branch.c')
| -rw-r--r-- | branch.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |