From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Wed, 6 Feb 2019 23:59:37 +0000 (+0000)
Subject: fetch-pack: clear alternate shallow in one more place
X-Git-Tag: v2.21.0-rc0~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=380ebab209bc444e7a8ed0e914a4c6d7440b1d29;p=thirdparty%2Fgit.git

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>
---

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;
 	}
 }