From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Sep 2022 19:56:39 +0000 (-0700)
Subject: Merge branch 'ab/unused-annotation'
X-Git-Tag: v2.38.0-rc0~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd407f1c7c7cce148d7313537494d0bc049ccb0e;p=thirdparty%2Fgit.git

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)"
---

dd407f1c7c7cce148d7313537494d0bc049ccb0e
diff --cc log-tree.c
index 6b93870279,ccdbf08feb..1dd5fcbf7b
--- a/log-tree.c
+++ b/log-tree.c
@@@ -135,10 -135,9 +135,10 @@@ static int ref_filter_match(const char 
  }
  
  static int add_ref_decoration(const char *refname, const struct object_id *oid,
- 			      int UNUSED(flags),
+ 			      int flags UNUSED,
  			      void *cb_data)
  {
 +	int i;
  	struct object *obj;
  	enum object_type objtype;
  	enum decoration_type deco_type = DECORATION_NONE;