diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-19 01:47:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-19 01:47:54 (GMT) |
| commit | b86e112056a5fb9515a28527a7c1976ec972b0db (patch) | |
| tree | be2a73c659ee4a23f37e7e582724950b33e61ac5 /builtin | |
| parent | 0517ae0ba6a69c5c11cb8660c3d491f525cba09c (diff) | |
| parent | 8b604d19515c4be18403047045faa363d4de217b (diff) | |
| download | git-b86e112056a5fb9515a28527a7c1976ec972b0db.zip git-b86e112056a5fb9515a28527a7c1976ec972b0db.tar.gz git-b86e112056a5fb9515a28527a7c1976ec972b0db.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index 9c13c68..e77163e 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) { |