diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 13:39:03 -0700 |
| commit | 9c7d0cc62f10d4945e665614ca836a4a5c81593c (patch) | |
| tree | 4d8a734760cb775bfd92414cad9fb2b179591142 /fetch-pack.c | |
| parent | Merge branch 'jc/stash-pop-not-popped' into maint (diff) | |
| parent | shallow: verify shallow file after taking lock (diff) | |
| download | git-9c7d0cc62f10d4945e665614ca836a4a5c81593c.tar.gz git-9c7d0cc62f10d4945e665614ca836a4a5c81593c.zip | |
Merge branch 'jk/shallow-update-fix' into maint
* 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.c | 11 |
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 |