From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Nanako Shiraishi <nanako3@lavabit.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jay Soffian <jaysoffian@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH] Switch receive.denyCurrentBranch to "refuse"
Date: Tue, 03 Feb 2009 00:01:43 -0800 [thread overview]
Message-ID: <7vskmwc5js.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20090202124148.GB8325@sigio.peff.net> (Jeff King's message of "Mon, 2 Feb 2009 07:41:48 -0500")
Jeff King <peff@peff.net> writes:
> I think this is a definite improvement over the current behavior. As I
> said before, I am not sure what is the right path (though I think I am
> leaning towards leaving the warning longer based on the recent
> discussion), but if we are to leave the default to warn and not refuse,
> I think this should definitely be applied.
>
> A few comments on the specific message:
Thanks.
The commit was only in 'pu', so I'll be amending it instead of applying an
incremental, but here is the interdiff to incorporate your comments.
builtin-receive-pack.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git c/builtin-receive-pack.c w/builtin-receive-pack.c
index f2c94fc..09c07d9 100644
--- c/builtin-receive-pack.c
+++ w/builtin-receive-pack.c
@@ -217,17 +217,18 @@ static int is_ref_checked_out(const char *ref)
static char *warn_unconfigured_deny_msg[] = {
"Updating the currently checked out branch may cause confusion,",
- "as the index and work tree do not reflect changes that are in HEAD."
+ "as the index and work tree do not reflect changes that are in HEAD.",
"As a result, you may see the changes you just pushed into it",
"reverted when you run 'git diff' over there, and you may want",
"to run 'git reset --hard' before starting to work to recover.",
"",
"You can set 'receive.denyCurrentBranch' configuration variable to",
- "'refuse' in the repository to forbid pushing into the current branch",
- "of it."
+ "'refuse' in the remote repository to forbid pushing into the",
+ "current branch of it."
"",
"To allow pushing into the current branch, you can set it to 'ignore';",
- "but this is not recommended unless you really know what you are doing.",
+ "but this is not recommended unless you arranged its work tree to get",
+ "updated to match what you pushed in some other way.",
"",
"To squelch this message, you can set it to 'warn'.",
"",
next prev parent reply other threads:[~2009-02-03 8:03 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1233275583u.git.johannes.schindelin@gmx.de>
2009-01-30 0:34 ` [PATCH] Switch receive.denyCurrentBranch to "refuse" Johannes Schindelin
2009-01-30 1:28 ` Jay Soffian
2009-01-30 1:32 ` Asheesh Laroia
2010-04-13 16:42 ` [PATCH] Switch receive.denyCurrentBranch to "refuse" Dave Abrahams
2010-04-13 17:57 ` [PATCH] Switch receive.denyCurrentBranch to "refuse" Junio C Hamano
[not found] ` <7v4ozhd1wp.fsf@gitster.siamese.dyndns.org>
2009-01-30 2:18 ` Junio C Hamano
2009-01-30 13:24 ` Johannes Schindelin
2009-01-30 16:33 ` Jeff King
2009-01-30 16:55 ` Johannes Schindelin
2009-01-30 2:30 ` Miklos Vajna
2009-01-30 13:28 ` Johannes Schindelin
2009-02-11 0:11 ` Miklos Vajna
2009-02-11 1:04 ` Junio C Hamano
2009-01-30 2:55 ` Jeff King
2009-01-30 14:11 ` Johannes Schindelin
2009-01-30 7:17 ` Johannes Sixt
2009-01-30 7:34 ` Jeff King
2009-01-30 13:23 ` Johannes Schindelin
2009-01-30 14:35 ` Jeff King
2009-01-30 16:17 ` Jay Soffian
2009-01-30 16:28 ` Jeff King
2009-01-30 17:01 ` Johannes Schindelin
2009-01-30 18:50 ` Jay Soffian
2009-01-30 19:03 ` Johannes Schindelin
2009-01-31 0:56 ` Nanako Shiraishi
2009-02-01 1:27 ` Junio C Hamano
2009-02-01 1:39 ` Junio C Hamano
2009-02-02 12:41 ` Jeff King
2009-02-03 4:30 ` Junio C Hamano
2009-02-03 17:45 ` Junio C Hamano
2009-02-06 14:06 ` Jeff King
2009-02-07 7:51 ` Junio C Hamano
2009-02-03 8:01 ` Junio C Hamano [this message]
2009-02-03 8:07 ` Jeff King
2009-02-03 9:22 ` Junio C Hamano
2009-02-01 2:06 ` Junio C Hamano
2009-02-01 3:37 ` Sam Vilain
2009-02-01 21:33 ` Junio C Hamano
2009-02-02 7:00 ` Sam Vilain
2009-02-02 8:32 ` Junio C Hamano
2009-02-02 10:50 ` Sam Vilain
2009-02-01 22:59 ` Johannes Schindelin
2009-02-01 23:56 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vskmwc5js.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jaysoffian@gmail.com \
--cc=nanako3@lavabit.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).