commit b450568209c8ae270d26ee7fda2e4687ad8a5327
author Chris Rorvick <chris@rorvick.com> Sun Dec 02 21:27:51 2012 -0600
committer Junio C Hamano <gitster@pobox.com> Mon Dec 03 08:04:09 2012 -0800
tree 7141322da5346153ef97169966607c67ff078757
parent 1184564eac8ef6c82da068a31f60aee0d6870265

push: allow already-exists advice to be disabled

Add 'advice.pushAlreadyExists' option to disable the advice shown when
an update is rejected for a reference that is not allowed to update at
all (verses those that are allowed to fast-forward.)

Signed-off-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

builtin/push.c

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