Make "parse_commit" return the "struct revision" for the commit.

Also, make it a fatal error to pass in a non-commit object. The callers
never checked, so better check here.

This simplifies merge-base further. It's now so trivial that it's almost
ridiculous.

1 files changed, 1 insertions, 4 deletions

diff --git a/merge-base.c b/merge-base.c
index 36ac42008..dac5e4b5e 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -46,10 +46,7 @@ int main(int argc, char **argv)
 	 * That's some time off, though, and in the meantime we know
 	 * that we have a solution to the eventual expense.
 	 */
-	parse_commit(rev1);
-	parse_commit(rev2);
-
-	common = common_parent(lookup_rev(rev1), lookup_rev(rev2));
+	common = common_parent(parse_commit(rev1), parse_commit(rev2));
 	if (!common)
 		die("no common parent found");
 	printf("%s\n", sha1_to_hex(common->sha1));