X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-base.c;h=ac1153bc5646cb2d515ff206b759f4a79e90273a;hb=4789576e0e5364dcd3916ef583b2ea61bef23f24;hp=0b99598f305593de5d48e6cbafcbdea359349c45;hpb=b5039db6d25ae25f1cb2db541ed13602784fafc3;p=git.git

diff --git a/merge-base.c b/merge-base.c
index 0b99598f3..ac1153bc5 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -85,11 +85,8 @@ int main(int argc, char **argv)
 	rev1 = lookup_commit(rev1key);
 	rev2 = lookup_commit(rev2key);
 	ret = common_ancestor(rev1, rev2);
-	if (ret) {
-		printf("%s\n", sha1_to_hex(ret->object.sha1));
-		return 0;
-	} else {
+	if (!ret)
 		return 1;
-	}
-	
+	printf("%s\n", sha1_to_hex(ret->object.sha1));
+	return 0;
 }