summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-08 20:05:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-08 20:05:32 (GMT)
commitf0d89001750a27c1c447b2eb3149b998521fa52c (patch)
tree01a5829fe13f88fa399429c56fdc1d3f798309cf /lockfile.c
parent9342f49738a6b539b94a344fdfd45cf29c93ffcd (diff)
parent9079ab7cb6768fa04e086303f90be043b423cca4 (diff)
downloadgit-f0d89001750a27c1c447b2eb3149b998521fa52c.zip
git-f0d89001750a27c1c447b2eb3149b998521fa52c.tar.gz
git-f0d89001750a27c1c447b2eb3149b998521fa52c.tar.bz2
Merge branch 'sp/stream-clean-filter'
When running a required clean filter, we do not have to mmap the original before feeding the filter. Instead, stream the file contents directly to the filter and process its output. * sp/stream-clean-filter: sha1_file: don't convert off_t to size_t too early to avoid potential die() convert: stream from fd to required clean filter to reduce used address space copy_fd(): do not close the input file descriptor mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT config.c: add git_env_ulong() to parse environment variable convert: drop arguments other than 'path' from would_convert_to_git()
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lockfile.c b/lockfile.c
index 2a800ce..d34a96d 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -224,8 +224,11 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
} else if (copy_fd(orig_fd, fd)) {
if (flags & LOCK_DIE_ON_ERROR)
exit(128);
+ close(orig_fd);
close(fd);
return -1;
+ } else {
+ close(orig_fd);
}
return fd;
}