[PATCH] fixup! push: switch default from "matching" to "simple"

[PATCH] fixup! push: switch default from "matching" to "simple"

[Matthieu Moy]

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
This is to be squashed into jc/push-2.0-default-to-simple

(Noticed while writing the other patch about --force)

 Documentation/git-push.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 9b9e7d1..81b875b 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -381,8 +381,10 @@ Examples
 	configured for the current branch).
 
 `git push origin`::
-	Without additional configuration, works like
-	`git push origin :`.
+	Without additional configuration, pushes the current branch to
+	the configured upstream (`remote.origin.merge` configuration
+	variable) if it has the same name as the current branch, and
+	errors out without pushing otherwise.
 +
 The default behavior of this command when no <refspec> is given can be
 configured by setting the `push` option of the remote, or the `push.default`
-- 
1.8.3.1.495.g13f33cf.dirty

Re: [PATCH] fixup! push: switch default from "matching" to "simple"

[Junio C Hamano]

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
> ---
> This is to be squashed into jc/push-2.0-default-to-simple
>
> (Noticed while writing the other patch about --force)

Thanks.

Note that this has to further change if Ram's triangular push fix
comes before 2.0.

I am not sure if these original two lines are necessary.  Wouldn't
it more appropriate to just drop the "Without additional configuration"
and go straight to "The default behaviour of this command..."?

>  Documentation/git-push.txt | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> index 9b9e7d1..81b875b 100644
> --- a/Documentation/git-push.txt
> +++ b/Documentation/git-push.txt
> @@ -381,8 +381,10 @@ Examples
>  	configured for the current branch).
>  
>  `git push origin`::
> -	Without additional configuration, works like
> -	`git push origin :`.
> +	Without additional configuration, pushes the current branch to
> +	the configured upstream (`remote.origin.merge` configuration
> +	variable) if it has the same name as the current branch, and
> +	errors out without pushing otherwise.
>  +
>  The default behavior of this command when no <refspec> is given can be
>  configured by setting the `push` option of the remote, or the `push.default`

Re: [PATCH] fixup! push: switch default from "matching" to "simple"

[Matthieu Moy]

Junio C Hamano <gitster@pobox.com> writes:

> Note that this has to further change if Ram's triangular push fix
> comes before 2.0.

I didn't follow precisely this topic. In any case, better have this in
the patch, if only as a reminder that this part will need to be updated.

> I am not sure if these original two lines are necessary.  Wouldn't
> it more appropriate to just drop the "Without additional configuration"
> and go straight to "The default behaviour of this command..."?

I think it makes sense to avoid having to go through too many sections
to understand the default behavior.

Right now, to know what "git push" does, the reader reads the
DESCRIPTION and finds nothing, reads the <refspec>... part and does not
see what happens when it's omitted, then see the EXAMPLE section

git push
=> see git push origin

git push origin
=> see push.default in git config --help

At least, keeping these lines, we avoid the last indirection.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/