drop casts from users EMPTY_TREE_SHA1_BIN

This macro already evaluates to the correct type, as it
casts the string literal to "unsigned char *" itself
(and callers who want the literal can use the _LITERAL
form).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/diff.c b/builtin/diff.c
index 424c815f9bc2ca8f87eb4694d1375b949b635170..9069dc41be33a362ff04d52c00b4830eed272826 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -327,7 +327,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                                add_head_to_pending(&rev);
                                if (!rev.pending.nr) {
                                        struct tree *tree;
                                add_head_to_pending(&rev);
                                if (!rev.pending.nr) {
                                        struct tree *tree;

-                                       tree = lookup_tree((const unsigned char*)EMPTY_TREE_SHA1_BIN);
+                                       tree = lookup_tree(EMPTY_TREE_SHA1_BIN);

                                        add_pending_object(&rev, &tree->object, "HEAD");
                                }
                                break;
                                        add_pending_object(&rev, &tree->object, "HEAD");
                                }
                                break;

diff --git a/merge-recursive.c b/merge-recursive.c
index 6479a60cd112c5b06b354b1a251c60bb4bce972a..318d32e223242b620c5bd43b2af808fa64b788a4 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1914,7 +1914,7 @@ int merge_recursive(struct merge_options *o,
                /* if there is no common ancestor, use an empty tree */
                struct tree *tree;
 
                /* 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");
        }
 
                merged_common_ancestors = make_virtual_commit(tree, "ancestor");
        }
 

diff --git a/sequencer.c b/sequencer.c
index a37846a594f5a2d6acfb075ece1b5c30dda2329f..4307364b261bcbe7a2e97116aa631aa7aa35613c 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -164,7 +164,7 @@ static void write_message(struct strbuf *msgbuf, const char *filename)
 
 static struct tree *empty_tree(void)
 {
 
 static struct tree *empty_tree(void)
 {

-       return lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN);
+       return lookup_tree(EMPTY_TREE_SHA1_BIN);

 }
 
 static int error_dirty_index(struct replay_opts *opts)
 }
 
 static int error_dirty_index(struct replay_opts *opts)