diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 10:55:16 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 14:48:54 -0700 |
commit | 00b7cbfcb36b6679c64ad0566c0fc251f7e979fe (patch) | |
tree | a84ff11fb7655394b6890b1bb571d249147bae72 /lockfile.c | |
parent | fdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff) | |
download | git-00b7cbfcb36b6679c64ad0566c0fc251f7e979fe.tar.gz |
copy.c: make copy_fd() report its status silently
When copy_fd() function encounters errors, it emits error messages
itself, which makes it impossible for callers to take responsibility
for reporting errors, especially when they want to ignore certain
errors.
Move the error reporting to its callers in preparation.
- copy_file() and copy_file_with_time() by indirection get their
own calls to error().
- hold_lock_file_for_append(), when told to die on error, used to
exit(128) relying on the error message from copy_fd(), but now it
does its own die() instead. Note that the callers that do not
pass LOCK_DIE_ON_ERROR need to be adjusted for this change, but
fortunately there is none ;-)
- filter_buffer_or_fd() has its own error() already, in addition to
the message from copy_fd(), so this will change the output but
arguably in a better way.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'lockfile.c')
-rw-r--r-- | lockfile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lockfile.c b/lockfile.c index 4f16ee78ce..beba0ed480 100644 --- a/lockfile.c +++ b/lockfile.c @@ -206,7 +206,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; |