Merge branch 'jk/diff-algo' into maint

diff --git a/fetch-pack.c b/fetch-pack.c
index 28195ed78b281204850de9c5bfeee03fa29efd79..aff4f5abab667d054c9ab1b925e4877a4fd8d243 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -846,6 +846,8 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
                packet_flush(fd[1]);
        if (args->depth > 0)
                setup_alternate_shallow(&shallow_lock, &alternate_shallow_file);
+       else
+               alternate_shallow_file = NULL;
        if (get_pack(args, fd, pack_lockfile))
                die("git fetch-pack: fetch failed.");
 
@@ -936,7 +938,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
        }
        ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought, pack_lockfile);
 
-       if (alternate_shallow_file) {
+       if (args->depth > 0 && alternate_shallow_file) {
                if (*alternate_shallow_file == '\0') { /* --unshallow */
                        unlink_or_warn(git_path("shallow"));
                        rollback_lock_file(&shallow_lock);