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 /replace-object.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 'replace-object.c')
| -rw-r--r-- | replace-object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/replace-object.c b/replace-object.c index 17810e5a3a..320be2522d 100644 --- a/replace-object.c +++ b/replace-object.c @@ -9,8 +9,8 @@ static int register_replace_ref(struct repository *r, const char *refname, const struct object_id *oid, - int UNUSED(flag), - void *UNUSED(cb_data)) + int flag UNUSED, + void *cb_data UNUSED) { /* Get sha1 from refname */ const char *slash = strrchr(refname, '/'); |