Merge branch 'jk/error-const-return'

* jk/error-const-return:
  Use __VA_ARGS__ for all of error's arguments

diff --cc git-compat-util.h
index cc2abeea0debcbe70c31320abb904e6d55cfe2bc,89fdf0561b2e4d427728af36d6ee81a27a187af0..b7eaaa99a802018a657e81e4421e40fb806b97b3
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
@@@ -305,13 -290,13 +305,13 @@@ extern void warning(const char *err, ..
  
  /*
   * Let callers be aware of the constant return value; this can help
-  * gcc with -Wuninitialized analysis. We have to restrict this trick to
-  * gcc, though, because of the variadic macro and the magic ## comma pasting
-  * behavior. But since we're only trying to help gcc, anyway, it's OK; other
-  * compilers will fall back to using the function as usual.
+  * gcc with -Wuninitialized analysis. We restrict this trick to gcc, though,
+  * because some compilers may not support variadic macros. Since we're only
+  * trying to help gcc, anyway, it's OK; other compilers will fall back to
+  * using the function as usual.
   */
 -#ifdef __GNUC__
 +#if defined(__GNUC__) && ! defined(__clang__)
- #define error(fmt, ...) (error((fmt), ##__VA_ARGS__), -1)
+ #define error(...) (error(__VA_ARGS__), -1)
  #endif
  
  extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));