mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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

1
repository.c
View File

@ -262,7 +262,6 @@ static void repo_clear_path_cache(struct repo_path_cache *cache)
FREE_AND_NULL(cache->merge_rr);
FREE_AND_NULL(cache->merge_mode);
FREE_AND_NULL(cache->merge_head);
FREE_AND_NULL(cache->merge_autostash);
FREE_AND_NULL(cache->fetch_head);
FREE_AND_NULL(cache->shallow);
}