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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9a0544cf1fba605bde7031c23016bc24db741417..92903f22d99e70905b5d49026f41ba65ffcd5019 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -140,7 +140,7 @@ advice.*::
        can tell Git that you do not need help by setting these to 'false':
 +
 --
        can tell Git that you do not need help by setting these to 'false':
 +
 --

-       pushNonFastForward::
+       pushUpdateRejected::

                Set this variable to 'false' if you want to disable
                'pushNonFFCurrent', 'pushNonFFDefault', and
                'pushNonFFMatching' simultaneously.
                Set this variable to 'false' if you want to disable
                'pushNonFFCurrent', 'pushNonFFDefault', and
                'pushNonFFMatching' simultaneously.

diff --git a/advice.c b/advice.c
index edfbd4a6fb01a6905671d6d842d22c4869fad729..329e0773dba8b3988caf4a7796ced1082c9a4c6a 100644 (file)
--- a/advice.c
+++ b/advice.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 
 #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;
 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[] = {
        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 },
        { "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 },
        { "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, ...)
 };
 
 void advise(const char *advice, ...)

diff --git a/advice.h b/advice.h
index f3cdbbf29e570e151b2b6b329ee9a9940ae59a98..c28ef8ac2319909c9824413b4c94a708ed76f621 100644 (file)
--- a/advice.h
+++ b/advice.h
@@ -3,7 +3,7 @@
 
 #include "git-compat-util.h"
 
 
 #include "git-compat-util.h"
 

-extern int advice_push_nonfastforward;
+extern int advice_push_update_rejected;

 extern int advice_push_non_ff_current;
 extern int advice_push_non_ff_default;
 extern int advice_push_non_ff_matching;
 extern int advice_push_non_ff_current;
 extern int advice_push_non_ff_default;
 extern int advice_push_non_ff_matching;

diff --git a/builtin/push.c b/builtin/push.c
index 83a3cc80c332a6b53c3f18365eaef2a406a531ef..cf5ecfaf0402207d440baa76ef4bd1c3fe6b5e81 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -226,21 +226,21 @@ static const char message_advice_ref_already_exists[] =
 
 static void advise_pull_before_push(void)
 {
 
 static void advise_pull_before_push(void)
 {

-       if (!advice_push_non_ff_current || !advice_push_nonfastforward)
+       if (!advice_push_non_ff_current || !advice_push_update_rejected)

                return;
        advise(_(message_advice_pull_before_push));
 }
 
 static void advise_use_upstream(void)
 {
                return;
        advise(_(message_advice_pull_before_push));
 }
 
 static void advise_use_upstream(void)
 {

-       if (!advice_push_non_ff_default || !advice_push_nonfastforward)
+       if (!advice_push_non_ff_default || !advice_push_update_rejected)

                return;
        advise(_(message_advice_use_upstream));
 }
 
 static void advise_checkout_pull_push(void)
 {
                return;
        advise(_(message_advice_use_upstream));
 }
 
 static void advise_checkout_pull_push(void)
 {

-       if (!advice_push_non_ff_matching || !advice_push_nonfastforward)
+       if (!advice_push_non_ff_matching || !advice_push_update_rejected)

                return;
        advise(_(message_advice_checkout_pull_push));
 }
                return;
        advise(_(message_advice_checkout_pull_push));
 }