From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael J Gruber Subject: Re: [PATCHv2 4/4] Rename push.default to push.mode Date: Mon, 30 Mar 2009 12:42:06 +0200 Message-ID: <49D0A1FE.60300@drmicha.warpmail.net> References: <1238407903-28020-1-git-send-email-santi@agolina.net> <1238407903-28020-5-git-send-email-santi@agolina.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: git@vger.kernel.org To: =?UTF-8?B?U2FudGkgQsOpamFy?= X-From: git-owner@vger.kernel.org Mon Mar 30 13:44:07 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LoFuJ-00029G-5L for gcvg-git-2@gmane.org; Mon, 30 Mar 2009 13:43:59 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751168AbZC3Lm2 convert rfc822-to-quoted-printable (ORCPT ); Mon, 30 Mar 2009 07:42:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751157AbZC3Lm1 (ORCPT ); Mon, 30 Mar 2009 07:42:27 -0400 Received: from out4.smtp.messagingengine.com ([66.111.4.28]:37007 "EHLO out4.smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750936AbZC3Lm1 (ORCPT ); Mon, 30 Mar 2009 07:42:27 -0400 Received: from compute2.internal (compute2.internal [10.202.2.42]) by out1.messagingengine.com (Postfix) with ESMTP id 70A5F306DCC; Mon, 30 Mar 2009 07:42:25 -0400 (EDT) Received: from heartbeat1.messagingengine.com ([10.202.2.160]) by compute2.internal (MEProxy); Mon, 30 Mar 2009 07:42:25 -0400 X-Sasl-enc: TlAd3TLCJrhlLJxVDVXoMRxyBppWMJ8U75ZDduYo9bnm 1238413344 Received: from localhost.localdomain (whitehead.math.tu-clausthal.de [139.174.44.12]) by mail.messagingengine.com (Postfix) with ESMTPSA id 94BFB2D095; Mon, 30 Mar 2009 07:42:24 -0400 (EDT) User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1b4pre) Gecko/20090328 Lightning/1.0pre Shredder/3.0b3pre In-Reply-To: <1238407903-28020-5-git-send-email-santi@agolina.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Santi B=C3=A9jar venit, vidit, dixit 30.03.2009 12:11: > push.default was too generic, and also didn't specify if it was about > remote, refspec, branches, behaviour... I guess we go for US spelling here, so it's "behavior" ;) >=20 > Signed-off-by: Santi B=C3=A9jar > --- > Documentation/RelNotes-1.6.3.txt | 2 +- > Documentation/config.txt | 4 ++-- > builtin-push.c | 16 ++++++++-------- > cache.h | 14 +++++++------- > config.c | 10 +++++----- > environment.c | 2 +- > 6 files changed, 24 insertions(+), 24 deletions(-) >=20 > diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNote= s-1.6.3.txt > index f0a2e41..67b2b66 100644 > --- a/Documentation/RelNotes-1.6.3.txt > +++ b/Documentation/RelNotes-1.6.3.txt > @@ -24,7 +24,7 @@ receive.denyDeleteCurrent in the receiving reposito= ry. > =20 > When the user does not tell "git push" what to push, it has always > pushed matching refs. For some people it is unexpected, and a new > -configuration variable push.default has been introduced to allow > +configuration variable push.mode has been introduced to allow > changing a different default behaviour. To advertise the new featur= e, Maybe time to change it here, too. > a big warning is issued if this is not configured and a git push wit= hout > arguments is attempted. > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 38ab785..80bb3a6 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -480,7 +480,7 @@ branch..remote:: > branch..merge:: > It defines, together with branch..remote, the upstream branch > for the given branch. It tells 'git-fetch'/'git-pull' which > - branch to merge and can also afect 'git-push' (see push.default). > + branch to merge and can also afect 'git-push' (see push.mode). s/afect/affect/ > When in branch , it tells 'git-fetch' the default > refspec to be marked for merging in FETCH_HEAD. The value is > handled like the remote part of a refspec, and must match a > @@ -1215,7 +1215,7 @@ pull.octopus:: > pull.twohead:: > The default merge strategy to use when pulling a single branch. > =20 > -push.default:: > +push.mode:: > Defines the action git push should take if no refspec is given > on the command line, no refspec is configured in the remote, and > no refspec is implied by any of the options given on the command > diff --git a/builtin-push.c b/builtin-push.c > index 2eabcd3..c2c4de1 100644 > --- a/builtin-push.c > +++ b/builtin-push.c > @@ -72,7 +72,7 @@ static const char *warn_unconfigured_push_msg[] =3D= { > "not necessarily be what you want to happen.", > "", > "You can specify what action you want to take in this case, and", > - "avoid seeing this message again, by configuring 'push.default' to:= ", > + "avoid seeing this message again, by configuring 'push.mode' to:", > " 'nothing' : Do not push anything", > " 'matching' : Push all matching branches (default)", > " 'tracking' : Push the current branch to whatever it is tracking"= , > @@ -89,26 +89,26 @@ static void warn_unconfigured_push(void) > static void setup_default_push_refspecs(void) > { > git_config(git_default_config, NULL); > - switch (push_default) { > - case PUSH_DEFAULT_UNSPECIFIED: > + switch (push_mode) { > + case PUSH_MODE_UNSPECIFIED: > warn_unconfigured_push(); > /* fallthrough */ > =20 > - case PUSH_DEFAULT_MATCHING: > + case PUSH_MODE_MATCHING: > add_refspec(":"); > break; > =20 > - case PUSH_DEFAULT_TRACKING: > + case PUSH_MODE_TRACKING: > setup_push_tracking(); > break; > =20 > - case PUSH_DEFAULT_CURRENT: > + case PUSH_MODE_CURRENT: > add_refspec("HEAD"); > break; > =20 > - case PUSH_DEFAULT_NOTHING: > + case PUSH_MODE_NOTHING: > die("You didn't specify any refspecs to push, and " > - "push.default is \"nothing\"."); > + "push.mode is \"nothing\"."); > break; > } > } > diff --git a/cache.h b/cache.h > index 641529b..1625965 100644 > --- a/cache.h > +++ b/cache.h > @@ -542,17 +542,17 @@ enum rebase_setup_type { > AUTOREBASE_ALWAYS, > }; > =20 > -enum push_default_type { > - PUSH_DEFAULT_UNSPECIFIED =3D -1, > - PUSH_DEFAULT_NOTHING =3D 0, > - PUSH_DEFAULT_MATCHING, > - PUSH_DEFAULT_TRACKING, > - PUSH_DEFAULT_CURRENT, > +enum push_mode_type { > + PUSH_MODE_UNSPECIFIED =3D -1, > + PUSH_MODE_NOTHING =3D 0, > + PUSH_MODE_MATCHING, > + PUSH_MODE_TRACKING, > + PUSH_MODE_CURRENT, > }; > =20 > extern enum branch_track git_branch_track; > extern enum rebase_setup_type autorebase; > -extern enum push_default_type push_default; > +extern enum push_mode_type push_mode; > =20 > #define GIT_REPO_VERSION 0 > extern int repository_format_version; > diff --git a/config.c b/config.c > index b76fe4c..ba02cfb 100644 > --- a/config.c > +++ b/config.c > @@ -567,17 +567,17 @@ static int git_default_branch_config(const char= *var, const char *value) > =20 > static int git_default_push_config(const char *var, const char *valu= e) > { > - if (!strcmp(var, "push.default")) { > + if (!strcmp(var, "push.mode")) { > if (!value) > return config_error_nonbool(var); > else if (!strcmp(value, "nothing")) > - push_default =3D PUSH_DEFAULT_NOTHING; > + push_mode =3D PUSH_MODE_NOTHING; > else if (!strcmp(value, "matching")) > - push_default =3D PUSH_DEFAULT_MATCHING; > + push_mode =3D PUSH_MODE_MATCHING; > else if (!strcmp(value, "tracking")) > - push_default =3D PUSH_DEFAULT_TRACKING; > + push_mode =3D PUSH_MODE_TRACKING; > else if (!strcmp(value, "current")) > - push_default =3D PUSH_DEFAULT_CURRENT; > + push_mode =3D PUSH_MODE_CURRENT; > else { > error("Malformed value for %s: %s", var, value); > return error("Must be one of nothing, matching, " > diff --git a/environment.c b/environment.c > index 4696885..c925ea4 100644 > --- a/environment.c > +++ b/environment.c > @@ -42,7 +42,7 @@ enum safe_crlf safe_crlf =3D SAFE_CRLF_WARN; > unsigned whitespace_rule_cfg =3D WS_DEFAULT_RULE; > enum branch_track git_branch_track =3D BRANCH_TRACK_REMOTE; > enum rebase_setup_type autorebase =3D AUTOREBASE_NEVER; > -enum push_default_type push_default =3D PUSH_DEFAULT_UNSPECIFIED; > +enum push_mode_type push_mode =3D PUSH_MODE_UNSPECIFIED; > =20 > /* Parallel index stat data preload? */ > int core_preload_index =3D 0; Your patches contain quoted-printable characters all over the place. Ar= e they not sent with git send-email? Michael