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>
Jeff King committed
Oct 24, 2013 at 04:54 UTC
367068e0dd1b7d6b5b4029749b326c6bad172498
2 files changed
+2
-4
shallow.c
+1
-2
@@ -89,8 +89,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
89
cur_depth = *(int *)commit->util;
90
}
91
}
92
- if (parse_commit(commit))
93
- die("invalid commit");
92
+ parse_commit_or_die(commit);
93
cur_depth++;
94
if (cur_depth >= depth) {
95
commit_list_insert(commit, &result);
upload-pack.c
+1
-2
@@ -694,8 +694,7 @@ static void receive_needs(void)
694
/* make sure the real parents are parsed */
695
unregister_shallow(object->sha1);
696
object->parsed = 0;
697
- if (parse_commit((struct commit *)object))
698
- die("invalid commit");
697
+ parse_commit_or_die((struct commit *)object);
698
parents = ((struct commit *)object)->parents;
699
while (parents) {
700
add_object_array(&parents->item->object,