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 /upload-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 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/upload-pack.c b/upload-pack.c index 0c44f6b292..a3c52f691d 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -81,7 +81,7 @@ static void create_pack_file(void) const char *argv[12]; int i, arg = 0; FILE *pipe_fd; - char *shallow_file = NULL; + const char *shallow_file = NULL; if (shallow_nr) { shallow_file = setup_temporary_shallow(NULL); @@ -242,11 +242,6 @@ static void create_pack_file(void) error("git upload-pack: git-pack-objects died with error."); goto fail; } - if (shallow_file) { - if (*shallow_file) - unlink(shallow_file); - free(shallow_file); - } /* flush the data */ if (0 <= buffered) { |