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

diff --cc attr.c
Simple merge

diff --cc builtin/bisect--helper.c
Simple merge

diff --cc builtin/commit-graph.c
Simple merge

diff --cc builtin/difftool.c
Simple merge

diff --cc builtin/fast-export.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/gc.c
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc builtin/multi-pack-index.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/reflog.c
Simple merge

diff --cc builtin/remote.c
Simple merge

diff --cc builtin/rev-parse.c
Simple merge

diff --cc builtin/stash.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc commit-graph.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc dir.c
Simple merge

diff --cc environment.c
Simple merge

diff --cc fetch-pack.c
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc log-tree.c
index 6b93870279cf335236db7fe243b00b166e0b9bd1,ccdbf08feba7ed6d9621f25b069d09ca56a4014a..1dd5fcbf7be433740d83382db4c401d438a51720
--- 1/log-tree.c
--- 2/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;

diff --cc notes.c
Simple merge

diff --cc packfile.c
Simple merge

diff --cc pretty.c
Simple merge

diff --cc range-diff.c
Simple merge

diff --cc refs.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc submodule.c
Simple merge

diff --cc upload-pack.c
Simple merge