From: Santi Béjar <santi@agolina.net>
Date: Fri, 19 Feb 2010 23:09:11 GMT
Subject: Re: [PATCH] documentation: update the "Pushing changes to a public repository" section
Message-ID: <adf1fd3d1002191509y60f4e411kfe2c0e8e580d4df9@mail.gmail.com>
In-Reply-To: <4df72b1a1002190845o2cbde92btb8804e2467ffda51@mail.gmail.com>

On Fri, Feb 19, 2010 at 5:45 PM, Elia Pinto <gitter.spiros@gmail.com> wrote:
> Extracted from git v1.7.0 Release Notes:
>
> * "git push" into a branch that is currently checked out (i.e. pointed at by
>   HEAD in a repository that is not bare) is refused by default.
>
> Update the user manual where necessary

It is a good change. I have some comments below, but I prefer when the
docs explain first the current behavior and afterwards, as a note or
alike, the prior behavior. Like this?

-repository that has a checked-out working tree, but the working tree
-will not be updated by the push.  This may lead to unexpected results if
-the branch you push to is the currently checked-out branch!
+repository that has a checked-out working tree, but not into a branch that is
+currently checked out (i.e. pointed at by HEAD in a repository that is not
+bare), as it is refused by default. This is not allowed by default because
+this may lead to unexpected results. Note that prior to the version 1.7 it was
+allowed.

> ---
>  Documentation/user-manual.txt |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
> index fe6fb72..0897839 100644
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
> @@ -1963,10 +1963,14 @@ As with `git fetch`, `git push` will complain
> if this does not result in a
>  handling this case.
>
>  Note that the target of a "push" is normally a
> -<<def_bare_repository,bare>> repository.  You can also push to a
> -repository that has a checked-out working tree, but the working tree
> -will not be updated by the push.  This may lead to unexpected results if
> -the branch you push to is the currently checked-out branch!
> +<<def_bare_repository,bare>> repository.  Until the version 1.7 you could

This implies that in 1.7 you can.

> +also push to a repository that has a checked-out working tree,
> +but the working tree will not be updated by the push.  This might lead to
> +unexpected results if the branch you pushed to was the currently checked-out
> +branch! From 1.7.0 git push" into a branch that is currently checked out

Missing ".

> +(i.e. pointed at by   HEAD in a repository that is not bare)
> +is refused by default.
> +

Thanks,
Santi