diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 12:56:39 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 12:56:39 -0700 |
commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /builtin/log.c | |
parent | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff) | |
parent | 9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff) | |
download | git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.gz |
Merge branch 'ab/unused-annotation'
Undoes 'jk/unused-annotation' topic and redoes it to work around
Coccinelle rules misfiring false positives in unrelated codepaths.
* ab/unused-annotation:
git-compat-util.h: use "deprecated" for UNUSED variables
git-compat-util.h: use "UNUSED", not "UNUSED(var)"
Diffstat (limited to 'builtin/log.c')
-rw-r--r-- | builtin/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 0a3f2fca28..ee19dc5d45 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -698,8 +698,8 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev) return 0; } -static int show_tree_object(const struct object_id *UNUSED(oid), - struct strbuf *UNUSED(base), +static int show_tree_object(const struct object_id *oid UNUSED, + struct strbuf *base UNUSED, const char *pathname, unsigned mode, void *context) { |