drop casts from users EMPTY_TREE_SHA1_BIN

peff · gitster · commit cba595bd21fd · 2012-03-23T13:52:05.000-07:00
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 &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;
-					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;
diff --git 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");
 	}
 
diff --git 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)
 {
-	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)

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ int cmd_diff(int argc, const char *argv, const char prefix)`
`327`	`327`	`add_head_to_pending(&rev);`
`328`	`328`	`if (!rev.pending.nr) {`
`329`	`329`	`struct tree *tree;`
`330`		`- tree = lookup_tree((const unsigned char*)EMPTY_TREE_SHA1_BIN);`
	`330`	`+ tree = lookup_tree(EMPTY_TREE_SHA1_BIN);`
`331`	`331`	`add_pending_object(&rev, &tree->object, "HEAD");`
`332`	`332`	`}`
`333`	`333`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -1914,7 +1914,7 @@ int merge_recursive(struct merge_options *o,`
`1914`	`1914`	`/* if there is no common ancestor, use an empty tree */`
`1915`	`1915`	`struct tree *tree;`
`1916`	`1916`
`1917`		`- tree = lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN);`
	`1917`	`+ tree = lookup_tree(EMPTY_TREE_SHA1_BIN);`
`1918`	`1918`	`merged_common_ancestors = make_virtual_commit(tree, "ancestor");`
`1919`	`1919`	`}`
`1920`	`1920`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ static void write_message(struct strbuf msgbuf, const char filename)`
`164`	`164`
`165`	`165`	`static struct tree *empty_tree(void)`
`166`	`166`	`{`
`167`		`- return lookup_tree((const unsigned char *)EMPTY_TREE_SHA1_BIN);`
	`167`	`+ return lookup_tree(EMPTY_TREE_SHA1_BIN);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`static int error_dirty_index(struct replay_opts *opts)`