Merge branch 'bm/merge-base-octopus-dedup'

diff --git a/shallow.c b/shallow.c
index cdf37d694de175adcce10fa2e2a79c6579603b0b..961cf6f02480e04d1baebb8f508aa17c5fea6355 100644 (file)
--- a/shallow.c
+++ b/shallow.c
@@ -90,8 +90,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);