summaryrefslogtreecommitdiff
path: root/fetch-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-21 12:33:29 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-21 12:33:29 -0700
commit3e14384b126cf9911a35dfda21f04abd4199aa54 (patch)
tree6970fdb221b531fda063389f03db7b6d0fc7dbfb /fetch-pack.c
parent4291cc10e6b8f720570d612e9d54d5ecd57986c9 (diff)
parent7839632167bc6ceef20f28bd046f7001493b070f (diff)
downloadgit-3e14384b126cf9911a35dfda21f04abd4199aa54.tar.gz
Merge branch 'jk/shallow-update-fix'
Serving objects from a shallow repository needs to write a new file to hold the temporary shallow boundaries but it was not cleaned when we exit due to die() or a signal. * jk/shallow-update-fix: shallow: verify shallow file after taking lock shallow: automatically clean up shallow tempfiles shallow: use stat_validity to check for up-to-date file
Diffstat (limited to 'fetch-pack.c')
-rw-r--r--fetch-pack.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/fetch-pack.c b/fetch-pack.c
index f061f1fe85..90d47da8a9 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -948,17 +948,6 @@ static void update_shallow(struct fetch_pack_args *args,
if (!si->shallow || !si->shallow->nr)
return;
- if (alternate_shallow_file) {
- /*
- * The temporary shallow file is only useful for
- * index-pack and unpack-objects because it may
- * contain more roots than we want. Delete it.
- */
- if (*alternate_shallow_file)
- unlink(alternate_shallow_file);
- free((char *)alternate_shallow_file);
- }
-
if (args->cloning) {
/*
* remote is shallow, but this is a clone, there are