diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-15 11:03:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-15 11:03:22 -0800 |
| commit | 43f9f053010c119c9836b2b5f8a07c72784f79b6 (patch) | |
| tree | eb5f0ccab93ffa12afe8b0d041d1fa3a65f2c14f /sha1_file.c | |
| parent | 4e363b11bdc3770efcfe55dac79f6dc18a5e562b (diff) | |
| parent | 24231e063f0f003f8ffd7b64c7ba6a0baaaa5283 (diff) | |
| download | git-43f9f053010c119c9836b2b5f8a07c72784f79b6.tar.gz git-43f9f053010c119c9836b2b5f8a07c72784f79b6.tar.xz | |
Merge branch 'maint'
* maint:
pull: do not display fetch usage on --help-all
git-tag.txt: list all modes in the description
commit,status: describe -u likewise
add: describe --patch like checkout, reset
commit,merge,tag: describe -m likewise
clone,init: describe --template using the same wording
commit,status: describe --porcelain just like push
commit,tag: use same wording for -F
configure: use AC_LANG_PROGRAM consistently
string_list_append: always set util pointer to NULL
correct type of EMPTY_TREE_SHA1_BIN
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
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 |