aboutsummaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-02-07 02:17:27 -0600
committerJunio C Hamano <gitster@pobox.com>2011-02-14 10:48:06 -0800
commitdab0d4108d7b45905a12ec6cea2cfc20ea8eabef (patch)
treecbb40a68ba305bc554aba9a8349fa2749727f4dc /sha1_file.c
parent9971d6d52c5afeb8ba60ae6ddcffb34af23eeadd (diff)
downloadgit-dab0d4108d7b45905a12ec6cea2cfc20ea8eabef.tar.gz
git-dab0d4108d7b45905a12ec6cea2cfc20ea8eabef.tar.xz
correct type of EMPTY_TREE_SHA1_BIN
Functions such as hashcmp that expect a binary SHA-1 value take parameters of type "unsigned char *" to avoid accepting a textual SHA-1 passed by mistake. Unfortunately, this means passing the string literal EMPTY_TREE_SHA1_BIN requires an ugly cast. Tweak the definition of EMPTY_TREE_SHA1_BIN to produce a value of more convenient type. In the future the definition might change to extern const unsigned char empty_tree_sha1_bin[20]; #define EMPTY_TREE_SHA1_BIN empty_tree_sha1_bin Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c
index 0b830c864..27730c334 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -52,7 +52,7 @@ static struct cached_object {
static int cached_object_nr, cached_object_alloc;
static struct cached_object empty_tree = {
- EMPTY_TREE_SHA1_BIN,
+ EMPTY_TREE_SHA1_BIN_LITERAL,
OBJ_TREE,
"",
0