summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2012-12-03 03:27:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-03 16:04:08 (GMT)
commit1184564eac8ef6c82da068a31f60aee0d6870265 (patch)
tree72309ffafe3d453c9ea44cc3d3691338bcbd942a /builtin/push.c
parenta272b2896dcfd2758e97e0f35cb14df4436d7101 (diff)
downloadgit-1184564eac8ef6c82da068a31f60aee0d6870265.zip
git-1184564eac8ef6c82da068a31f60aee0d6870265.tar.gz
git-1184564eac8ef6c82da068a31f60aee0d6870265.tar.bz2
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>
Diffstat (limited to 'builtin/push.c')
-rw-r--r--builtin/push.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/push.c b/builtin/push.c
index 83a3cc8..cf5ecfa 100644
--- 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)
{
- 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));
}