Merge branch 'maint-2.5' into maint-2.6

diff --git a/fetch-pack.c b/fetch-pack.c
index a1367721527a6a354e80da76088c341eb1273bd5..820251a8d80518508514b728b4b2afd8a171e296 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -948,7 +948,7 @@ static void update_shallow(struct fetch_pack_args *args,
 
        if (args->depth > 0 && alternate_shallow_file) {
                if (*alternate_shallow_file == '\0') { /* --unshallow */
-                       unlink_or_warn(git_path("shallow"));
+                       unlink_or_warn(git_path_shallow());
                        rollback_lock_file(&shallow_lock);
                } else
                        commit_lock_file(&shallow_lock);