diff options
author | Jeff King <peff@peff.net> | 2014-02-27 06:25:20 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 12:07:13 -0800 |
commit | 0179c945fce361c56b465e8a3f0fdf0962a816a1 (patch) | |
tree | 714556b0cbd64a39b374adc71484bc3e4e4a5a05 /fetch-pack.c | |
parent | 0cc77c386cea7afebb54a5e7263ca37569ecfe7a (diff) | |
download | git-0179c945fce361c56b465e8a3f0fdf0962a816a1.tar.gz |
shallow: automatically clean up shallow tempfiles
We sometimes write tempfiles of the form "shallow_XXXXXX"
during fetch/push operations with shallow repositories.
Under normal circumstances, we clean up the result when we
are done. However, we do no take steps to clean up after
ourselves when we exit due to die() or signal death.
This patch teaches the tempfile creation code to register
handlers to clean up after ourselves. To handle this, we
change the ownership semantics of the filename returned by
setup_temporary_shallow. It now keeps a copy of the filename
itself, and returns only a const pointer to it.
We can also do away with explicit tempfile removal in the
callers. They all exit not long after finishing with the
file, so they can rely on the auto-cleanup, simplifying the
code.
Note that we keep things simple and maintain only a single
filename to be cleaned. This is sufficient for the current
caller, but we future-proof it with a die("BUG").
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 90fdd49821..ae8550eb48 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -947,17 +947,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 |