branch: segfault fixes and validation

diff --git a/cache.h b/cache.h
index c257953fa798110e0f4be9258f4f88f2d7952bdb..1f96f659e484fd1407dbc403c4095205cf3b0c54 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1011,7 +1011,6 @@ struct ref {
                requires_force:1,
                merge:1,
                nonfastforward:1,
-               not_forwardable:1,
                update:1,
                deletion:1;
        enum {
@@ -1148,7 +1147,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);