diff options
| author |  Jeff King <peff@peff.net> | 2013-10-24 04:54:01 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-10-24 15:43:51 -0700 |
| commit | 367068e0dd1b7d6b5b4029749b326c6bad172498 (patch) | |
| tree | e3387b0afa554b0547719b1b8d1d26f0cd821d61 | |
| parent | use parse_commit_or_die instead of segfaulting (diff) | |
| download | tgif-367068e0dd1b7d6b5b4029749b326c6bad172498.tar.xz | |
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>
| -rw-r--r-- | shallow.c | 3 | ||||
| -rw-r--r-- | upload-pack.c | 3 |
2 files changed, 2 insertions, 4 deletions
@@ -89,8 +89,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, cur_depth = *(int *)commit->util; } } - if (parse_commit(commit)) - die("invalid commit"); + parse_commit_or_die(commit); cur_depth++; if (cur_depth >= depth) { commit_list_insert(commit, &result); 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, |