mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push: rename config variable for more general use

Browse Source 
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>
This commit is contained in:
Chris Rorvick
2012-12-02 21:27:50 -06:00
committed by Junio C Hamano
parent a272b2896d
commit 1184564eac
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/config.txt
View File

@ -140,7 +140,7 @@ advice.*::
can tell Git that you do not need help by setting these to 'false': can tell Git that you do not need help by setting these to 'false':
+ +
-- --
pushNonFastForward:: pushUpdateRejected::
Set this variable to 'false' if you want to disable Set this variable to 'false' if you want to disable
'pushNonFFCurrent', 'pushNonFFDefault', and 'pushNonFFCurrent', 'pushNonFFDefault', and
'pushNonFFMatching' simultaneously. 'pushNonFFMatching' simultaneously.

7
advice.c
View File

@ -1,6 +1,6 @@
#include "cache.h" #include "cache.h"
int advice_push_nonfastforward = 1; int advice_push_update_rejected = 1;
int advice_push_non_ff_current = 1; int advice_push_non_ff_current = 1;
int advice_push_non_ff_default = 1; int advice_push_non_ff_default = 1;
int advice_push_non_ff_matching = 1; int advice_push_non_ff_matching = 1;
@ -14,7 +14,7 @@ static struct {
const char *name; const char *name;
int *preference; int *preference;
} advice_config[] = { } advice_config[] = {
{ "pushnonfastforward", &advice_push_nonfastforward }, { "pushupdaterejected", &advice_push_update_rejected },
{ "pushnonffcurrent", &advice_push_non_ff_current }, { "pushnonffcurrent", &advice_push_non_ff_current },
{ "pushnonffdefault", &advice_push_non_ff_default }, { "pushnonffdefault", &advice_push_non_ff_default },
{ "pushnonffmatching", &advice_push_non_ff_matching }, { "pushnonffmatching", &advice_push_non_ff_matching },
@ -23,6 +23,9 @@ static struct {
{ "resolveconflict", &advice_resolve_conflict }, { "resolveconflict", &advice_resolve_conflict },
{ "implicitidentity", &advice_implicit_identity }, { "implicitidentity", &advice_implicit_identity },
{ "detachedhead", &advice_detached_head }, { "detachedhead", &advice_detached_head },
/* make this an alias for backward compatibility */
{ "pushnonfastforward", &advice_push_update_rejected }
}; };
void advise(const char *advice, ...) void advise(const char *advice, ...)

2
advice.h
View File

@ -3,7 +3,7 @@
#include "git-compat-util.h" #include "git-compat-util.h"
extern int advice_push_nonfastforward; extern int advice_push_update_rejected;
extern int advice_push_non_ff_current; extern int advice_push_non_ff_current;
extern int advice_push_non_ff_default; extern int advice_push_non_ff_default;
extern int advice_push_non_ff_matching; extern int advice_push_non_ff_matching;

6
builtin/push.c
View File

@ -226,21 +226,21 @@ static const char message_advice_ref_already_exists[] =
static void advise_pull_before_push(void) 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; return;
advise(_(message_advice_pull_before_push)); advise(_(message_advice_pull_before_push));
} }
static void advise_use_upstream(void) 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; return;
advise(_(message_advice_use_upstream)); advise(_(message_advice_use_upstream));
} }
static void advise_checkout_pull_push(void) 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; return;
advise(_(message_advice_checkout_pull_push)); advise(_(message_advice_checkout_pull_push));
} }