diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2011-02-07 02:17:27 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-14 10:48:06 -0800 |
| commit | dab0d4108d7b45905a12ec6cea2cfc20ea8eabef (patch) | |
| tree | cbb40a68ba305bc554aba9a8349fa2749727f4dc /notes-merge.c | |
| parent | 9971d6d52c5afeb8ba60ae6ddcffb34af23eeadd (diff) | |
| download | git-dab0d4108d7b45905a12ec6cea2cfc20ea8eabef.tar.gz | |
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 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index 71c4d45fcd..1467ad3179 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -615,7 +615,7 @@ int notes_merge(struct notes_merge_options *o, bases = get_merge_bases(local, remote, 1); if (!bases) { base_sha1 = null_sha1; - base_tree_sha1 = (unsigned char *)EMPTY_TREE_SHA1_BIN; + base_tree_sha1 = EMPTY_TREE_SHA1_BIN; OUTPUT(o, 4, "No merge base found; doing history-less merge"); } else if (!bases->next) { base_sha1 = bases->item->object.sha1; |