Re: [PATCH] Switch receive.denyCurrentBranch to "refuse"
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:46:05
Jeff King [off-list ref] 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'.", "",