diff options
| author | Jeff King <peff@peff.net> | 2012-03-22 22:53:24 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-24 00:52:05 +0400 |
| commit | cba595bd21fd0731e37898dbd6c5b55f65fd8aea (patch) | |
| tree | 2bd67efd15c4aab92cd7abde661c500a663edeef /merge-recursive.c | |
| parent | 498a04af143f55a7bbbba484d48a7f123d43be04 (diff) | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6479a60cd1..318d32e223 100644 --- 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; - 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"); } |