summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-09-27 02:02:11 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-27 15:45:24 +0900
commit41dcc4dcccecca49e3f75212ce9e614ffe2bdcc8 (patch)
tree1511cf57f1762ba21bc920a85239063a16e7de91 /builtin
parentavoid looking at errno for short read_in_full() returns (diff)
downloadtgif-41dcc4dcccecca49e3f75212ce9e614ffe2bdcc8.tar.xz
distinguish error versus short read from read_in_full()
Many callers of read_in_full() expect to see the exact number of bytes requested, but their error handling lumps together true read errors and short reads due to unexpected EOF. We can give more specific error messages by separating these cases (showing errno when appropriate, and otherwise describing the short read). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/get-tar-commit-id.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index cd3e656828..2706fcfaf2 100644
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -26,8 +26,10 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
usage(builtin_get_tar_commit_id_usage);
n = read_in_full(0, buffer, HEADERSIZE);
+ if (n < 0)
+ die_errno("git get-tar-commit-id: read error");
if (n != HEADERSIZE)
- die("git get-tar-commit-id: read error");
+ die_errno("git get-tar-commit-id: EOF before reading tar header");
if (header->typeflag[0] != 'g')
return 1;
if (!skip_prefix(content, "52 comment=", &comment))