diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:28 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:28 -0700 |
commit | 40cfc95856594ddd04ae6ef3bfd041346c4854ec (patch) | |
tree | 13f4a476ed02d287c34a3460341deacb2dcd6a53 /combine-diff.c | |
parent | 8648eacc1d45a7d25cb4d293549bbe6ae17cbd81 (diff) | |
parent | 1da045fb9db5db8f01eb5e7c6106880ca5274643 (diff) | |
download | git-40cfc95856594ddd04ae6ef3bfd041346c4854ec.tar.gz |
Merge branch 'nd/error-errno'
The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
* nd/error-errno: (41 commits)
wrapper.c: use warning_errno()
vcs-svn: use error_errno()
upload-pack.c: use error_errno()
unpack-trees.c: use error_errno()
transport-helper.c: use error_errno()
sha1_file.c: use {error,die,warning}_errno()
server-info.c: use error_errno()
sequencer.c: use error_errno()
run-command.c: use error_errno()
rerere.c: use error_errno() and warning_errno()
reachable.c: use error_errno()
mailmap.c: use error_errno()
ident.c: use warning_errno()
http.c: use error_errno() and warning_errno()
grep.c: use error_errno()
gpg-interface.c: use error_errno()
fast-import.c: use error_errno()
entry.c: use error_errno()
editor.c: use error_errno()
diff-no-index.c: use error_errno()
...
Diffstat (limited to 'combine-diff.c')
-rw-r--r-- | combine-diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index 0e1d4b0893..8f2313d502 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1005,8 +1005,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, struct strbuf buf = STRBUF_INIT; if (strbuf_readlink(&buf, elem->path, st.st_size) < 0) { - error("readlink(%s): %s", elem->path, - strerror(errno)); + error_errno("readlink(%s)", elem->path); return; } result_size = buf.len; |