Merge branch 'ap/log-mailmap'

diff --git a/builtin/push.c b/builtin/push.c
index cf5ecfaf0402207d440baa76ef4bd1c3fe6b5e81..8491e431e41aaff32c76ab0c61f528682b3babdb 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -247,6 +247,8 @@ static void advise_checkout_pull_push(void)
 
 static void advise_ref_already_exists(void)
 {
+       if (!advice_push_already_exists || !advice_push_update_rejected)
+               return;
        advise(_(message_advice_ref_already_exists));
 }