summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2012-12-03 03:27:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-03 16:04:09 (GMT)
commitb450568209c8ae270d26ee7fda2e4687ad8a5327 (patch)
tree7141322da5346153ef97169966607c67ff078757 /builtin/push.c
parent1184564eac8ef6c82da068a31f60aee0d6870265 (diff)
downloadgit-b450568209c8ae270d26ee7fda2e4687ad8a5327.zip
git-b450568209c8ae270d26ee7fda2e4687ad8a5327.tar.gz
git-b450568209c8ae270d26ee7fda2e4687ad8a5327.tar.bz2
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>
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c2
1 files changed, 2 insertions, 0 deletions
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_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));
}