summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2012-12-02 21:27:50 -0600
committerJunio C Hamano <gitster@pobox.com>2012-12-03 08:04:08 -0800
commit1184564eac8ef6c82da068a31f60aee0d6870265 (patch)
tree72309ffafe3d453c9ea44cc3d3691338bcbd942a /advice.c
parenta272b2896dcfd2758e97e0f35cb14df4436d7101 (diff)
downloadgit-1184564eac8ef6c82da068a31f60aee0d6870265.tar.gz
push: rename config variable for more general use
The 'pushNonFastForward' advice config can be used to squelch several instances of push-related advice. Rename it to 'pushUpdateRejected' to cover other reject scenarios that are unrelated to fast-forwarding. Retain the old name for compatibility. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.c')
-rw-r--r--advice.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/advice.c b/advice.c
index edfbd4a6fb..329e0773db 100644
--- a/advice.c
+++ b/advice.c
@@ -1,6 +1,6 @@
#include "cache.h"
-int advice_push_nonfastforward = 1;
+int advice_push_update_rejected = 1;
int advice_push_non_ff_current = 1;
int advice_push_non_ff_default = 1;
int advice_push_non_ff_matching = 1;
@@ -14,7 +14,7 @@ static struct {
const char *name;
int *preference;
} advice_config[] = {
- { "pushnonfastforward", &advice_push_nonfastforward },
+ { "pushupdaterejected", &advice_push_update_rejected },
{ "pushnonffcurrent", &advice_push_non_ff_current },
{ "pushnonffdefault", &advice_push_non_ff_default },
{ "pushnonffmatching", &advice_push_non_ff_matching },
@@ -23,6 +23,9 @@ static struct {
{ "resolveconflict", &advice_resolve_conflict },
{ "implicitidentity", &advice_implicit_identity },
{ "detachedhead", &advice_detached_head },
+
+ /* make this an alias for backward compatibility */
+ { "pushnonfastforward", &advice_push_update_rejected }
};
void advise(const char *advice, ...)