diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:30 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-10 21:46:30 +0300 |
commit | a4b1a0ade42a03e81376144653400c061fa6ed52 (patch) | |
tree | 2a302df433e89aeaa535992d880d9ed6b5eeed8b | |
parent | fd0d7036e0da248f354e91fb8be8771fb20adfac (diff) | |
parent | 6540b716140784f329de7bac954d2651e9d3e321 (diff) |
Merge branch 'cb/remote-ndebug-fix'
Build fix.
* cb/remote-ndebug-fix:
remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG
-rw-r--r-- | remote.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -135,7 +135,7 @@ static inline void init_remotes_hash(void) static struct remote *make_remote(const char *name, int len) { - struct remote *ret, *replaced; + struct remote *ret; struct remotes_hash_key lookup; struct hashmap_entry lookup_entry, *e; @@ -162,8 +162,8 @@ static struct remote *make_remote(const char *name, int len) remotes[remotes_nr++] = ret; hashmap_entry_init(&ret->ent, lookup_entry.hash); - replaced = hashmap_put_entry(&remotes_hash, ret, ent); - assert(replaced == NULL); /* no previous entry overwritten */ + if (hashmap_put_entry(&remotes_hash, ret, ent)) + BUG("hashmap_put overwrote entry after hashmap_get returned NULL"); return ret; } |