Add a few more values for receive.denyCurrentBranch
commit1a300b8cae3aa28c52d1ae315dc1c18c596056b3
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 16 Feb 2009 20:52:51 +0000 (16 21:52 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Fri, 10 Sep 2010 22:44:07 +0000 (10 23:44 +0100)
tree82cfbf486c9dbaaa980bb65f362c67a1cf76f542
parent8ad3e7d6220dc66dd9787c5ece987326c815ad98
Add a few more values for receive.denyCurrentBranch

For a long time, this developer thought that Git's insistence that
pushing into the current branch is evil was completely merited.

Just for fun, the original patch tried to show people that Git is right
there, and that it causes more trouble than it does good when Git allows
you to try to update the working tree for fast-forwards, or to detach the
HEAD, depending on some config settings.

Surprisingly, the opposite was shown.

So here is the support for two new options you can give the config
variable receive.denyCurrentBranch:

'updateInstead':
Try to merge the working tree with the new tip of the branch
(which can lead to really horrible merge conflicts).

'detachInstead':
Detach the HEAD, thereby avoiding a disagreement between the
HEAD and the index (as well as the working tree), possibly
leaving the local user wondering how on earth her HEAD became
so detached.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Documentation/config.txt
builtin/receive-pack.c
t/t5516-fetch-push.sh