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 /repository.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 'repository.c')
| -rw-r--r-- | repository.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/repository.c b/repository.c index a931e3b1b3..7aacb51b65 100644 --- a/repository.c +++ b/repository.c @@ -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); } |