summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-10-24 04:54:01 -0400
committerJunio C Hamano <gitster@pobox.com>2013-10-24 15:43:51 -0700
commit367068e0dd1b7d6b5b4029749b326c6bad172498 (patch)
treee3387b0afa554b0547719b1b8d1d26f0cd821d61 /upload-pack.c
parent683ff884cce955cc331929d857fac9d6bd69f46a (diff)
downloadgit-367068e0dd1b7d6b5b4029749b326c6bad172498.tar.gz
use parse_commit_or_die instead of custom message
Many calls to parse_commit detect errors and die. In some cases, the custom error messages are more useful than what parse_commit_or_die could produce, because they give some context, like which ref the commit came from. Some, however, just say "invalid commit". Let's convert the latter to use parse_commit_or_die; its message is slightly more informative, and it makes the error more consistent throughout git. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c
index 127e59a603..c107686cea 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -694,8 +694,7 @@ static void receive_needs(void)
/* make sure the real parents are parsed */
unregister_shallow(object->sha1);
object->parsed = 0;
- if (parse_commit((struct commit *)object))
- die("invalid commit");
+ parse_commit_or_die((struct commit *)object);
parents = ((struct commit *)object)->parents;
while (parents) {
add_object_array(&parents->item->object,