Merge branch 'rr/minimal-stat'

diff --git a/cache.h b/cache.h
index ab20c4ddf3d68398f4cad5d53d4cde013703bbec..7339f21849b45a7f53945317893313498aff5a41 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1012,7 +1012,6 @@ struct ref {
                requires_force:1,
                merge:1,
                nonfastforward:1,
-               not_forwardable:1,
                update:1,
                deletion:1;
        enum {
@@ -1149,7 +1148,7 @@ extern int check_repository_format_version(const char *var, const char *value, v
 extern int git_env_bool(const char *, int);
 extern int git_config_system(void);
 extern int config_error_nonbool(const char *);
-#ifdef __GNUC__
+#if defined(__GNUC__) && ! defined(__clang__)
 #define config_error_nonbool(s) (config_error_nonbool(s), -1)
 #endif
 extern const char *get_log_output_encoding(void);