diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-09-14 19:56:39 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-14 19:56:39 (GMT) |
commit | dd407f1c7c7cce148d7313537494d0bc049ccb0e (patch) | |
tree | 960438c348acf300fca1f9e795b647df2d6f8e18 /pretty.c | |
parent | a6b42ec0c6e2ef492b0ed6d1f1123dc7e724154e (diff) | |
parent | 9ff7eb8c8882c477919acfe28a3d68bb58adf2ea (diff) | |
download | git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.zip git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.gz git-dd407f1c7c7cce148d7313537494d0bc049ccb0e.tar.bz2 |
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 'pretty.c')
-rw-r--r-- | pretty.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -44,7 +44,7 @@ static void save_user_format(struct rev_info *rev, const char *cp, int is_tforma } static int git_pretty_formats_config(const char *var, const char *value, - void *UNUSED(cb)) + void *cb UNUSED) { struct cmt_fmt_map *commit_format = NULL; const char *name; |