drop casts from users EMPTY_TREE_SHA1_BIN
[gitweb.git] / merge-recursive.c
index 6479a60cd112c5b06b354b1a251c60bb4bce972a..318d32e223242b620c5bd43b2af808fa64b788a4 100644 (file)
@@ -1914,7 +1914,7 @@ int merge_recursive(struct merge_options *o,
                /* if there is no common ancestor, use an empty tree */
                struct tree *tree;
 
-               tree = lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN);
+               tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
                merged_common_ancestors = make_virtual_commit(tree, "ancestor");
        }