summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-22 12:41:57 -0700
committerJunio C Hamano <gitster@pobox.com>2015-05-22 12:41:57 -0700
commitddaf4e2e9a8b38185405205ddead638cf052728e (patch)
tree67c406d62df91a583c2a7a34af92c1317e6b966f /lockfile.c
parent5bf66689d5a4ddc4ce7b3b88a15f6bcf6a0c13fa (diff)
parent0c4dd67a048b39470b9b95912e4912fecc405a85 (diff)
downloadgit-ddaf4e2e9a8b38185405205ddead638cf052728e.tar.gz
Merge branch 'jc/ignore-epipe-in-filter'
Filter scripts were run with SIGPIPE disabled on the Git side, expecting that they may not read what Git feeds them to filter. We however treated a filter that does not read its input fully before exiting as an error. This changes semantics, but arguably in a good way. If a filter can produce its output without consuming its input using whatever magic, we now let it do so, instead of diagnosing it as a programming error. * jc/ignore-epipe-in-filter: filter_buffer_or_fd(): ignore EPIPE copy.c: make copy_fd() report its status silently
Diffstat (limited to 'lockfile.c')
-rw-r--r--lockfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lockfile.c b/lockfile.c
index 30e65e9d22..5a93bc7bc2 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -289,7 +289,7 @@ int hold_lock_file_for_append(struct lock_file *lk, const char *path, int flags)
int save_errno = errno;
if (flags & LOCK_DIE_ON_ERROR)
- exit(128);
+ die("failed to prepare '%s' for appending", path);
close(orig_fd);
rollback_lock_file(lk);
errno = save_errno;