Re: [PATCH v2 02/15] user-manual: Update for receive.denyCurrentBranch=refuse
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 14, 2013, 18:57 UTC
- Message-ID
- <7v4nhezpta.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <7v1ucnssnw.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 19 quoted lines
> "W. Trevor King" <wking@tremily.us> writes: > >> On Sun, Feb 10, 2013 at 01:24:47PM -0800, Junio C Hamano wrote: >>> I would not be surprised if some readers felt as if "then why not >>> update it instead of rejecting?" were a valid question, without a >>> bit more explanation. >>> >>> You can also push to a repository that has a working tree, >>> … >> >> Looks good to me :). Shall I just drop this patch from v3 and leave >> it to you? > > No. > > Others need to object to, comment on and polish what you saw from > me, before it turns into a commit. And you need to be credited for > identifying the problem, initiating the discussion, and collecting > responses to result in the final patch.
I did not think the detailed discussion belongs there in the first place, so I re-read the context. I think the only thing the reader of the user manual needs to learn at that point of the flow is that they can push to a non-bare but cannot push to update the currently checked out branch by default. So let's tone everything down and do this instead:
-- >8 -- From: "W. Trevor King" <wking@tremily.us> Date: Fri, 8 Feb 2013 12:04:20 -0500 Subject: [PATCH] user-manual: Update for receive.denyCurrentBranch=refuse
acd2a45 (Refuse updating the current branch in a non-bare repository via push, 2009-02-11) changed the default to refuse such a push, but it forgot to update the docs.
7d182f5 (Documentation: receive.denyCurrentBranch defaults to 'refuse', 2010-03-17) updated Documentation/config.txt, but forgot to update the user manual.
Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Documentation/user-manual.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 85651b5..7c534dc 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1986,9 +1986,10 @@ 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! +repository that has a checked-out working tree, but a push to update the +currently checked-out branch is denied by default to prevent confusion. +See the description ofthe receive.denyCurrentBranch option +in linkgit:git-config[1] for details. As with `git fetch`, you may also set up configuration options to save typing; so, for example, after