summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-10-31 20:15:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-10-31 20:15:21 (GMT)
commit906d6906fb580f2002bfdaadab80da6884bab16f (patch)
treeaa2f6fae92c550a78573b34dcdc343ad363f0d05 /builtin
parent7805bda2ac68c659b0042f45473723d9fdcece74 (diff)
parenta0a6cb96625cebe8590841c469bfbb461a132ae3 (diff)
downloadgit-906d6906fb580f2002bfdaadab80da6884bab16f.zip
git-906d6906fb580f2002bfdaadab80da6884bab16f.tar.gz
git-906d6906fb580f2002bfdaadab80da6884bab16f.tar.bz2
Merge branch 'ls/git-open-cloexec'
Git generally does not explicitly close file descriptors that were open in the parent process when spawning a child process, but most of the time the child does not want to access them. As Windows does not allow removing or renaming a file that has a file descriptor open, a slow-to-exit child can even break the parent process by holding onto them. Use O_CLOEXEC flag to open files in various codepaths. * ls/git-open-cloexec: read-cache: make sure file handles are not inherited by child processes sha1_file: open window into packfiles with O_CLOEXEC sha1_file: rename git_open_noatime() to git_open()
Diffstat (limited to 'builtin')
-rw-r--r--builtin/pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 1e7c2a9..0fd52bd 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -720,7 +720,7 @@ static off_t write_reused_pack(struct sha1file *f)
if (!is_pack_valid(reuse_packfile))
die("packfile is invalid: %s", reuse_packfile->pack_name);
- fd = git_open_noatime(reuse_packfile->pack_name);
+ fd = git_open(reuse_packfile->pack_name);
if (fd < 0)
die_errno("unable to open packfile for reuse: %s",
reuse_packfile->pack_name);