summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-19 10:47:54 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-19 10:47:54 +0900
commitb86e112056a5fb9515a28527a7c1976ec972b0db (patch)
treebe2a73c659ee4a23f37e7e582724950b33e61ac5 /builtin
parentMerge branch 'bb/doc-eol-dirty' (diff)
parenthashmap: add API to disable item counting when threaded (diff)
downloadtgif-b86e112056a5fb9515a28527a7c1976ec972b0db.tar.xz
Merge branch 'jh/hashmap-disable-counting'
Our hashmap implementation in hashmap.[ch] is not thread-safe when adding a new item needs to expand the hashtable by rehashing; add an API to disable the automatic rehashing to work it around. * jh/hashmap-disable-counting: hashmap: add API to disable item counting when threaded
Diffstat (limited to 'builtin')
-rw-r--r--builtin/describe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/describe.c b/builtin/describe.c
index 9c13c6817b..e77163e909 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -508,7 +508,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
hashmap_init(&names, commit_name_cmp, NULL, 0);
for_each_rawref(get_name, NULL);
- if (!names.size && !always)
+ if (!hashmap_get_size(&names) && !always)
die(_("No names found, cannot describe anything."));
if (argc == 0) {