aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Carlo Marcelo Arenas Belón <carenas@gmail.com> 2021-08-08 18:38:32 -0700
committerGravatar Junio C Hamano <gitster@pobox.com> 2021-08-09 09:01:30 -0700
commitdd3c8a72a2eaecf0c752a37e1f4ba4de59818e93 (patch)
treeac9b0aa0162122f31d92008892554a62ab4b7bb1
parent14825944d7c57b6acd7e1a05a4c6046965efc6a5 (diff)
downloadgit-dd3c8a72a2eaecf0c752a37e1f4ba4de59818e93.tar.gz
git-dd3c8a72a2eaecf0c752a37e1f4ba4de59818e93.zip
object-store: avoid extra ';' from KHASH_INIT
cf2dc1c238 (speed up alt_odb_usable() with many alternates, 2021-07-07) introduces a KHASH_INIT invocation with a trailing ';', which while commonly expected will trigger warnings with pedantic on both clang[-Wextra-semi] and gcc[-Wpedantic], because that macro has already a semicolon and is meant to be invoked without one. while fixing the macro would be a worthy solution (specially considering this is a common recurring problem), remove the extra ';' for now to minimize churn. Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--object-store.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/object-store.h b/object-store.h
index e679acc4c3..d24915ced1 100644
--- a/object-store.h
+++ b/object-store.h
@@ -34,7 +34,7 @@ struct object_directory {
};
KHASH_INIT(odb_path_map, const char * /* key: odb_path */,
- struct object_directory *, 1, fspathhash, fspatheq);
+ struct object_directory *, 1, fspathhash, fspatheq)
void prepare_alt_odb(struct repository *r);
char *compute_alternate_path(const char *path, struct strbuf *err);