[PATCH] advice: Remove unused advice_push_non_ff_default
- From
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
- Date
- Mar 16, 2013, 17:58 UTC
- Message-ID
- <5144B2B1.3030106@ramsay1.demon.co.uk>
Commit 27f76a2b ('push: switch default from "matching" to "simple"', 04-01-2013) removed the last use of the 'advice_push_non_ff_default' variable, along with the advice message which it used to suppress.
Remove the 'advice_push_non_ff_default' variable definition, along with the now redundant advice.pushnonffdefault config variable (including it's documentation).
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> ---
Hi Junio,
Commit 27f76a2b is in next, but you are about to re-build next, right? Could you please squash this (or something like it) into commit 27f76a2b.
Note that this patch was built on the tip of the pu branch. Also, I have not re-built the documentation to check the formatting; I stopped building the documentation some time ago!
NOTE: I just noticed that I missed a use of 'pushNonFFDefault' in the documentation of 'advice.pushUpdateRejected', just above the change made to Documentation/config.txt below. Sorry about that!
Thanks!
ATB, Ramsay Jones
Documentation/config.txt | 6 ------ advice.c | 2 -- advice.h | 1 - 3 files changed, 9 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4730dd2..06327cd 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -149,12 +149,6 @@ advice.*:: pushNonFFCurrent:: Advice shown when linkgit:git-push[1] fails due to a non-fast-forward update to the current branch. - pushNonFFDefault:: - Advice to set 'push.default' to 'upstream' or 'current' - when you ran linkgit:git-push[1] and pushed 'matching - refs' by default (i.e. you did not provide an explicit - refspec, and no 'push.default' configuration was set) - and it resulted in a non-fast-forward error. pushNonFFMatching:: Advice shown when you ran linkgit:git-push[1] and pushed 'matching refs' explicitly (i.e. you used ':', or diff --git a/advice.c b/advice.c index 780f58d..88c4fea 100644 --- a/advice.c +++ b/advice.c @@ -2,7 +2,6 @@ int advice_push_update_rejected = 1; int advice_push_non_ff_current = 1; -int advice_push_non_ff_default = 1; int advice_push_non_ff_matching = 1; int advice_push_already_exists = 1; int advice_push_fetch_first = 1; @@ -19,7 +18,6 @@ static struct { } advice_config[] = { { "pushupdaterejected", &advice_push_update_rejected }, { "pushnonffcurrent", &advice_push_non_ff_current }, - { "pushnonffdefault", &advice_push_non_ff_default }, { "pushnonffmatching", &advice_push_non_ff_matching }, { "pushalreadyexists", &advice_push_already_exists }, { "pushfetchfirst", &advice_push_fetch_first }, diff --git a/advice.h b/advice.h index fad36df..4d1e1f9 100644 --- a/advice.h +++ b/advice.h @@ -5,7 +5,6 @@ extern int advice_push_update_rejected; extern int advice_push_non_ff_current; -extern int advice_push_non_ff_default; extern int advice_push_non_ff_matching; extern int advice_push_already_exists; extern int advice_push_fetch_first;
-- 1.8.2