Merge branch 'mk/complete-tcsh'

diff --git a/builtin/push.c b/builtin/push.c
index 83a3cc80c332a6b53c3f18365eaef2a406a531ef..8491e431e41aaff32c76ab0c61f528682b3babdb 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -226,27 +226,29 @@ static const char message_advice_ref_already_exists[] =
 
 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)
 {
-       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)
 {
-       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));
 }
 
 static void advise_ref_already_exists(void)
 {
+       if (!advice_push_already_exists || !advice_push_update_rejected)
+               return;
        advise(_(message_advice_ref_already_exists));
 }