Re: [PATCH v2] fetch-pack: clear alternate shallow when complete
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 7, 2019, 02:53 UTC
- Message-ID
- <xmqqzhr8qpfl.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <xmqq4l9gs49w.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
>> The patch looks good to me. > > Thanks, all.
Oops, spoke a bit too fast. As the previous one is already in 'next', let's do this instead.
-- >8 -- From: "brian m. carlson" <sandals@crustytoothpaste.net> Date: Wed, 6 Feb 2019 23:59:37 +0000 Subject: [PATCH] fetch-pack: clear alternate shallow in one more place
The previous one did not clear the variable in one codepath, but we should aim to be complete.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> [jc: made a reroll into incremental, as the previous one already is in the next branch] Signed-off-by: Junio C Hamano <gitster@pobox.com> --- fetch-pack.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/fetch-pack.c b/fetch-pack.c index 2d76287674..a92621a388 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1272,6 +1272,8 @@ static void receive_shallow_info(struct fetch_pack_args *args, setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, NULL); args->deepen = 1; + } else { + alternate_shallow_file = NULL; } }
-- 2.20.1-519-g8feddda32c