[PATCH 0/4] push.default and branch.<name>.{remote,merge} changes

[PATCH 0/4] push.default and branch.<name>.{remote,merge} changes

[Santi Béjar]

Hi *,

  the four patches are independent, but I've send them in a series because
their topic is related. Well, there is a textual dependency between the 3rd
and the 4th.

  The 1st one can also be applied to 'maint' while the rest is on top of 'next'
because the 'push.default' is only there.

Santi Béjar (4):
  Documentation: enhance branch.<name>.{remote,merge}
  Documentation: push.default applies to all remotes
  Documentation: branch.*.merge can also afect 'git-push'
  Rename push.default to push.style

 Documentation/RelNotes-1.6.3.txt |    2 +-
 Documentation/config.txt         |   21 ++++++++++-----------
 builtin-push.c                   |   16 ++++++++--------
 cache.h                          |   14 +++++++-------
 config.c                         |   10 +++++-----
 environment.c                    |    2 +-
 6 files changed, 32 insertions(+), 33 deletions(-)

[PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}

[Santi Béjar]

The documentation for branch.*.merge is very dense, so add a simple
explanation on top of it.

And branch.*.remote also afects 'git push'. Text taken from
'push.default'.

Signed-off-by: Santi Béjar <santi@agolina.net>
---
 Documentation/config.txt |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 089569a..56f0cd7 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -473,10 +473,14 @@ branch.autosetuprebase::
 	This option defaults to never.
 
 branch.<name>.remote::
-	When in branch <name>, it tells 'git-fetch' which remote to fetch.
-	If this option is not given, 'git-fetch' defaults to remote "origin".
+	When in branch <name>, it tells 'git-fetch' and 'git-push' which
+	remote to fetch/push, and defaults to `origin` if no remote is
+	configured. `origin` is also used if you are not on any branch.
 
 branch.<name>.merge::
+	It defines, together with branch.<name>.remote, the tracking branch
+	for the current branch. It tells 'git-fetch'/'git-pull' which
+	branch to merge.
 	When in branch <name>, 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
-- 
1.6.1.258.g7ff14

[PATCH 2/4] Documentation: push.default applies to all remotes

[Santi Béjar]

push.default is not only for the current remote but setting the default
behaviour for all remotes.

Signed-off-by: Santi Béjar <santi@agolina.net>
---
 Documentation/config.txt |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 56f0cd7..07f88f5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1219,19 +1219,14 @@ push.default::
 	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
-	line.
-+
-The term `current remote` means the remote configured for the current
-branch, or `origin` if no remote is configured. `origin` is also used
-if you are not on any branch. Possible values are:
+	line. Possible values are:
 +
 * `nothing` do not push anything.
-* `matching` push all matching branches to the current remote.
+* `matching` push all matching branches.
   All branches having the same name in both ends are considered to be
   matching. This is the current default value.
 * `tracking` push the current branch to the branch it is tracking.
-* `current` push the current branch to a branch of the same name on the
-  current remote.
+* `current` push the current branch to a branch of the same name.
 
 rebase.stat::
 	Whether to show a diffstat of what changed upstream since the last
-- 
1.6.1.258.g7ff14

[PATCH 3/4] Documentation: branch.*.merge can also afect 'git-push'

[Santi Béjar]

Signed-off-by: Santi Béjar <santi@agolina.net>
---
 Documentation/config.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 07f88f5..cb392fd 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
 branch.<name>.merge::
 	It defines, together with branch.<name>.remote, the tracking branch
 	for the current branch. It tells 'git-fetch'/'git-pull' which
-	branch to merge.
+	branch to merge and can also afect 'git-push' (see push.default).
 	When in branch <name>, 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
-- 
1.6.1.258.g7ff14

[PATCH 4/4] Rename push.default to push.style

[Santi Béjar]

push.default was too generic, and also didn't specify if it was about
remote, refspec, branches, behaviour...

Signed-off-by: Santi Béjar <santi@agolina.net>
---
 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(-)

diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
index f0a2e41..f3533e6 100644
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
@@ -24,7 +24,7 @@ receive.denyDeleteCurrent in the receiving repository.
 
 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.style has been introduced to allow
 changing a different default behaviour.  To advertise the new feature,
 a big warning is issued if this is not configured and a git push without
 arguments is attempted.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cb392fd..f2d675a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
 branch.<name>.merge::
 	It defines, together with branch.<name>.remote, the tracking branch
 	for the current 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.style).
 	When in branch <name>, 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.
 
-push.default::
+push.style::
 	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..ba0dd6f 100644
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -72,7 +72,7 @@ static const char *warn_unconfigured_push_msg[] = {
 	"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.style' 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_style) {
+	case PUSH_STYLE_UNSPECIFIED:
 		warn_unconfigured_push();
 		/* fallthrough */
 
-	case PUSH_DEFAULT_MATCHING:
+	case PUSH_STYLE_MATCHING:
 		add_refspec(":");
 		break;
 
-	case PUSH_DEFAULT_TRACKING:
+	case PUSH_STYLE_TRACKING:
 		setup_push_tracking();
 		break;
 
-	case PUSH_DEFAULT_CURRENT:
+	case PUSH_STYLE_CURRENT:
 		add_refspec("HEAD");
 		break;
 
-	case PUSH_DEFAULT_NOTHING:
+	case PUSH_STYLE_NOTHING:
 		die("You didn't specify any refspecs to push, and "
-		    "push.default is \"nothing\".");
+		    "push.style is \"nothing\".");
 		break;
 	}
 }
diff --git a/cache.h b/cache.h
index 641529b..9190046 100644
--- a/cache.h
+++ b/cache.h
@@ -542,17 +542,17 @@ enum rebase_setup_type {
 	AUTOREBASE_ALWAYS,
 };
 
-enum push_default_type {
-	PUSH_DEFAULT_UNSPECIFIED = -1,
-	PUSH_DEFAULT_NOTHING = 0,
-	PUSH_DEFAULT_MATCHING,
-	PUSH_DEFAULT_TRACKING,
-	PUSH_DEFAULT_CURRENT,
+enum push_style_type {
+	PUSH_STYLE_UNSPECIFIED = -1,
+	PUSH_STYLE_NOTHING = 0,
+	PUSH_STYLE_MATCHING,
+	PUSH_STYLE_TRACKING,
+	PUSH_STYLE_CURRENT,
 };
 
 extern enum branch_track git_branch_track;
 extern enum rebase_setup_type autorebase;
-extern enum push_default_type push_default;
+extern enum push_style_type push_style;
 
 #define GIT_REPO_VERSION 0
 extern int repository_format_version;
diff --git a/config.c b/config.c
index b76fe4c..86ac830 100644
--- a/config.c
+++ b/config.c
@@ -567,17 +567,17 @@ static int git_default_branch_config(const char *var, const char *value)
 
 static int git_default_push_config(const char *var, const char *value)
 {
-	if (!strcmp(var, "push.default")) {
+	if (!strcmp(var, "push.style")) {
 		if (!value)
 			return config_error_nonbool(var);
 		else if (!strcmp(value, "nothing"))
-			push_default = PUSH_DEFAULT_NOTHING;
+			push_style = PUSH_STYLE_NOTHING;
 		else if (!strcmp(value, "matching"))
-			push_default = PUSH_DEFAULT_MATCHING;
+			push_style = PUSH_STYLE_MATCHING;
 		else if (!strcmp(value, "tracking"))
-			push_default = PUSH_DEFAULT_TRACKING;
+			push_style = PUSH_STYLE_TRACKING;
 		else if (!strcmp(value, "current"))
-			push_default = PUSH_DEFAULT_CURRENT;
+			push_style = PUSH_STYLE_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..8d2450c 100644
--- a/environment.c
+++ b/environment.c
@@ -42,7 +42,7 @@ enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
 enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
 enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
-enum push_default_type push_default = PUSH_DEFAULT_UNSPECIFIED;
+enum push_style_type push_style = PUSH_STYLE_UNSPECIFIED;
 
 /* Parallel index stat data preload? */
 int core_preload_index = 0;
-- 
1.6.1.258.g7ff14

Re: [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}

[Jay Soffian]

On Sat, Mar 28, 2009 at 7:10 PM, Santi Béjar <santi@agolina.net> wrote:
>  branch.<name>.merge::
> +       It defines, together with branch.<name>.remote, the tracking branch
> +       for the current branch. It tells 'git-fetch'/'git-pull' which
> +       branch to merge.

I think it would be clearer to say "the upstream branch for the
current branch", since
it could very well be a local branch, not necessarily a remote tracking branch.

j.

Re: [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge}

[Santi Béjar]

2009/3/29 Jay Soffian <jaysoffian@gmail.com>:
> On Sat, Mar 28, 2009 at 7:10 PM, Santi Béjar <santi@agolina.net> wrote:
>>  branch.<name>.merge::
>> +       It defines, together with branch.<name>.remote, the tracking branch
>> +       for the current branch. It tells 'git-fetch'/'git-pull' which
>> +       branch to merge.
>
> I think it would be clearer to say "the upstream branch for the
> current branch", since
> it could very well be a local branch, not necessarily a remote tracking branch.

It makes sense, thanks.

Santi

Re: [PATCH 4/4] Rename push.default to push.style

[Finn Arne Gangstad]

On Sun, Mar 29, 2009 at 12:10:04AM +0100, Santi Béjar wrote:
> push.default was too generic, and also didn't specify if it was about
> remote, refspec, branches, behaviour...
> [...]
>  	"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.style' to:",
>  	"  'nothing'  : Do not push anything",
>  	"  'matching' : Push all matching branches (default)",
>  	"  'tracking' : Push the current branch to whatever it is tracking",
> [...]

I don't think "push.style" is an improvement. "style" sounds like it
affects all pushes. This configuration variable says what push should
do when no refspec is given and none are configured, so the word
"default" should be in there at least. Maybe "defaultref" would have
been better?

Some people may have started setting push.default already, so changing
the name may cause additional grief.

- Finn Arne

Re: [PATCH 4/4] Rename push.default to push.style

[Johannes Schindelin]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1186 bytes --]

Hi,

On Mon, 30 Mar 2009, Finn Arne Gangstad wrote:

> On Sun, Mar 29, 2009 at 12:10:04AM +0100, Santi Béjar wrote:
> > push.default was too generic, and also didn't specify if it was about
> > remote, refspec, branches, behaviour...
> > [...]
> >  	"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.style' to:",
> >  	"  'nothing'  : Do not push anything",
> >  	"  'matching' : Push all matching branches (default)",
> >  	"  'tracking' : Push the current branch to whatever it is tracking",
> > [...]
> 
> I don't think "push.style" is an improvement. "style" sounds like it 
> affects all pushes. This configuration variable says what push should do 
> when no refspec is given and none are configured, so the word "default" 
> should be in there at least. Maybe "defaultref" would have been better?

I'd prefer "push.defaultMode", but...

> Some people may have started setting push.default already, so changing 
> the name may cause additional grief.

... indeed, it is too late now.  The milk has boiled already.

Ciao,
Dscho

Re: [PATCH 4/4] Rename push.default to push.style

[Santi Béjar]

2009/3/30 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
> Hi,
>
> On Mon, 30 Mar 2009, Finn Arne Gangstad wrote:
>
>> On Sun, Mar 29, 2009 at 12:10:04AM +0100, Santi Béjar wrote:
>> > push.default was too generic, and also didn't specify if it was about
>> > remote, refspec, branches, behaviour...
>> > [...]
>> >     "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.style' to:",
>> >     "  'nothing'  : Do not push anything",
>> >     "  'matching' : Push all matching branches (default)",
>> >     "  'tracking' : Push the current branch to whatever it is tracking",
>> > [...]
>>
>> I don't think "push.style" is an improvement. "style" sounds like it
>> affects all pushes.

Not for me. I says the style of the push. But maybe push.mode could be better.

>> This configuration variable says what push should do
>> when no refspec is given and none are configured, so the word "default"
>> should be in there at least. Maybe "defaultref" would have been better?

I don't see the point of the word default, a lot of configuration is
to set the default value. Git has branch.name.remote, not
branch.name.defaultremote, or user.email, not user.defaultemail,...

>
> I'd prefer "push.defaultMode", but...
>
>> Some people may have started setting push.default already, so changing
>> the name may cause additional grief.
>
> ... indeed, it is too late now.  The milk has boiled already.

I have it configured, but I think we can fix these type of things
while they are in 'next'.

Santi

Re: [PATCH 4/4] Rename push.default to push.style

[Santi Béjar]

2009/3/30 Santi Béjar <santi@agolina.net>:
> 2009/3/30 Johannes Schindelin <Johannes.Schindelin@gmx.de>:
>> On Mon, 30 Mar 2009, Finn Arne Gangstad wrote:
>>> Some people may have started setting push.default already, so changing
>>> the name may cause additional grief.
>>
>> ... indeed, it is too late now.  The milk has boiled already.
>
> I have it configured, but I think we can fix these type of things
> while they are in 'next'.
>

Now that I've recheck it, it seems to be in 'master', it's less clear,
but I still think we can fix these type of things while they are not
in a relased version.

The people with that setting is following the development version, and
can easily notice/change it.

Santi

Re: [PATCH 4/4] Rename push.default to push.style

[Jeff King]

On Mon, Mar 30, 2009 at 11:00:03AM +0200, Santi Béjar wrote:

> >> This configuration variable says what push should do
> >> when no refspec is given and none are configured, so the word "default"
> >> should be in there at least. Maybe "defaultref" would have been better?
> 
> I don't see the point of the word default, a lot of configuration is
> to set the default value. Git has branch.name.remote, not
> branch.name.defaultremote, or user.email, not user.defaultemail,...

The usual case is two layers of options: command line and config
options. Thus "git push <remote>" overrides "branch.*.remote".

But in this case there are actually _three_ layers: command line,
branch.*.push, and now push.default. I think a name like "push.mode"
doesn't make clear the fact that it will never be looked at if you have
"branch.*.push" set up.

I think you have a point that "default" is vague, but "defaultMode"
would be better than simply "mode".

-Peff

Re: [PATCH 4/4] Rename push.default to push.style

[Santi Béjar]

2009/3/30 Jeff King <peff@peff.net>:
> On Mon, Mar 30, 2009 at 11:00:03AM +0200, Santi Béjar wrote:
>
>> >> This configuration variable says what push should do
>> >> when no refspec is given and none are configured, so the word "default"
>> >> should be in there at least. Maybe "defaultref" would have been better?
>>
>> I don't see the point of the word default, a lot of configuration is
>> to set the default value. Git has branch.name.remote, not
>> branch.name.defaultremote, or user.email, not user.defaultemail,...
>
> The usual case is two layers of options: command line and config
> options. Thus "git push <remote>" overrides "branch.*.remote".
>
> But in this case there are actually _three_ layers: command line,
> branch.*.push, and now push.default. I think a name like "push.mode"
> doesn't make clear the fact that it will never be looked at if you have
> "branch.*.push" set up.
>
> I think you have a point that "default" is vague, but "defaultMode"
> would be better than simply "mode".

Thanks, it makes sense. Now I find defaultMode better than 'mode'.

Santi