summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2019-02-06 23:59:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-02-07 02:50:49 (GMT)
commit380ebab209bc444e7a8ed0e914a4c6d7440b1d29 (patch)
tree87589796110aa2d1bcfd530e349596a84b15e15f
parent23311f35424705f11acf80685bac1fe27e36192f (diff)
downloadgit-380ebab209bc444e7a8ed0e914a4c6d7440b1d29.zip
git-380ebab209bc444e7a8ed0e914a4c6d7440b1d29.tar.gz
git-380ebab209bc444e7a8ed0e914a4c6d7440b1d29.tar.bz2
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>
-rw-r--r--fetch-pack.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index 2d76287..a92621a 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;
}
}