{"thread":{"id":"33200","subject":"[PATCH] advice: Remove unused advice_push_non_ff_default","startedAt":"2013-03-16T17:58:09Z","lastAt":"2013-03-16T17:58:09Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"211465","messageId":"5144B2B1.3030106@ramsay1.demon.co.uk","threadId":"33200","inReplyTo":null,"subject":"[PATCH] advice: Remove unused advice_push_non_ff_default","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2013-03-16T17:58:09Z","receivedAt":"2013-03-16T17:58:09Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nCommit 27f76a2b ('push: switch default from \"matching\" to \"simple\"',\n04-01-2013) removed the last use of the 'advice_push_non_ff_default'\nvariable, along with the advice message which it used to suppress.\n\nRemove the 'advice_push_non_ff_default' variable definition, along\nwith the now redundant advice.pushnonffdefault config variable\n(including it's documentation).\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n\nHi Junio,\n\nCommit 27f76a2b is in next, but you are about to re-build next, right?\nCould you please squash this (or something like it) into commit 27f76a2b.\n\nNote that this patch was built on the tip of the pu branch. Also, I have\nnot re-built the documentation to check the formatting; I stopped building\nthe documentation some time ago!\n\nNOTE: I just noticed that I missed a use of 'pushNonFFDefault' in the\ndocumentation of 'advice.pushUpdateRejected', just above the change made\nto Documentation/config.txt below. Sorry about that!\n\nThanks!\n\nATB,\nRamsay Jones\n\n Documentation/config.txt | 6 ------\n advice.c                 | 2 --\n advice.h                 | 1 -\n 3 files changed, 9 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 4730dd2..06327cd 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -149,12 +149,6 @@ advice.*::\n \tpushNonFFCurrent::\n \t\tAdvice shown when linkgit:git-push[1] fails due to a\n \t\tnon-fast-forward update to the current branch.\n-\tpushNonFFDefault::\n-\t\tAdvice to set 'push.default' to 'upstream' or 'current'\n-\t\twhen you ran linkgit:git-push[1] and pushed 'matching\n-\t\trefs' by default (i.e. you did not provide an explicit\n-\t\trefspec, and no 'push.default' configuration was set)\n-\t\tand it resulted in a non-fast-forward error.\n \tpushNonFFMatching::\n \t\tAdvice shown when you ran linkgit:git-push[1] and pushed\n \t\t'matching refs' explicitly (i.e. you used ':', or\ndiff --git a/advice.c b/advice.c\nindex 780f58d..88c4fea 100644\n--- a/advice.c\n+++ b/advice.c\n@@ -2,7 +2,6 @@\n \n int advice_push_update_rejected = 1;\n int advice_push_non_ff_current = 1;\n-int advice_push_non_ff_default = 1;\n int advice_push_non_ff_matching = 1;\n int advice_push_already_exists = 1;\n int advice_push_fetch_first = 1;\n@@ -19,7 +18,6 @@ static struct {\n } advice_config[] = {\n \t{ \"pushupdaterejected\", &advice_push_update_rejected },\n \t{ \"pushnonffcurrent\", &advice_push_non_ff_current },\n-\t{ \"pushnonffdefault\", &advice_push_non_ff_default },\n \t{ \"pushnonffmatching\", &advice_push_non_ff_matching },\n \t{ \"pushalreadyexists\", &advice_push_already_exists },\n \t{ \"pushfetchfirst\", &advice_push_fetch_first },\ndiff --git a/advice.h b/advice.h\nindex fad36df..4d1e1f9 100644\n--- a/advice.h\n+++ b/advice.h\n@@ -5,7 +5,6 @@\n \n extern int advice_push_update_rejected;\n extern int advice_push_non_ff_current;\n-extern int advice_push_non_ff_default;\n extern int advice_push_non_ff_matching;\n extern int advice_push_already_exists;\n extern int advice_push_fetch_first;\n-- \n1.8.2\n"}]}