commit-reach: fix cast in compare_commits_by_gen()
[gitweb.git] / merge.c
diff --git a/merge.c b/merge.c
index b433291d0c376ea3ba0a1c56b465cc1b91da4ddf..0783858739f84028df6eef85d3673c944fabb912 100644 (file)
--- a/merge.c
+++ b/merge.c
 
 static const char *merge_argument(struct commit *commit)
 {
-       if (commit)
-               return oid_to_hex(&commit->object.oid);
-       else
-               return EMPTY_TREE_SHA1_HEX;
+       return oid_to_hex(commit ? &commit->object.oid : the_hash_algo->empty_tree);
 }
 
 int index_has_changes(struct strbuf *sb)