diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 22:56:39 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 22:56:39 +0300 |
commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /builtin/stash.c | |
parent | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff) | |
parent | 9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff) |
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/stash.c')
-rw-r--r-- | builtin/stash.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index 932c6173cf..2274aae255 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -638,12 +638,12 @@ cleanup: return ret; } -static int reject_reflog_ent(struct object_id *UNUSED(ooid), - struct object_id *UNUSED(noid), - const char *UNUSED(email), - timestamp_t UNUSED(timestamp), - int UNUSED(tz), const char *UNUSED(message), - void *UNUSED(cb_data)) +static int reject_reflog_ent(struct object_id *ooid UNUSED, + struct object_id *noid UNUSED, + const char *email UNUSED, + timestamp_t timestamp UNUSED, + int tz UNUSED, const char *message UNUSED, + void *cb_data UNUSED) { return 1; } |