In the next patch we want to make a distinction if a the advice was requested explicitly or is set implicit. To do that we need to have different values for the default and a value that is set explicitly. Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx> --- advice.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/advice.c b/advice.c index b84ae49..56b70b6 100644 --- a/advice.c +++ b/advice.c @@ -1,20 +1,20 @@ #include "cache.h" -int advice_push_update_rejected = 1; -int advice_push_non_ff_current = 1; -int advice_push_non_ff_matching = 1; -int advice_push_already_exists = 1; -int advice_push_fetch_first = 1; -int advice_push_needs_force = 1; -int advice_status_hints = 1; -int advice_status_u_option = 1; -int advice_commit_before_merge = 1; -int advice_resolve_conflict = 1; -int advice_implicit_identity = 1; -int advice_detached_head = 1; -int advice_set_upstream_failure = 1; -int advice_object_name_warning = 1; -int advice_rm_hints = 1; +int advice_push_update_rejected = -1; +int advice_push_non_ff_current = -1; +int advice_push_non_ff_matching = -1; +int advice_push_already_exists = -1; +int advice_push_fetch_first = -1; +int advice_push_needs_force = -1; +int advice_status_hints = -1; +int advice_status_u_option = -1; +int advice_commit_before_merge = -1; +int advice_resolve_conflict = -1; +int advice_implicit_identity = -1; +int advice_detached_head = -1; +int advice_set_upstream_failure = -1; +int advice_object_name_warning = -1; +int advice_rm_hints = -1; static struct { const char *name; -- 2.9.2.730.g525ad04.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html