aboutsummaryrefslogtreecommitdiff
path: root/t/t5522-pull-symlink.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-11 02:28:03 -0800
committerJunio C Hamano <gitster@pobox.com>2009-07-29 10:15:00 -0700
commitacd2a45b83e50c0f33b01ee74df241f1adfdff39 (patch)
tree2dd1dd6c6c0630ebb43b88e1cbd8256ebbd83659 /t/t5522-pull-symlink.sh
parent6641575963388b61f408f177d91cdacad25d2e26 (diff)
downloadgit-acd2a45b83e50c0f33b01ee74df241f1adfdff39.tar.gz
git-acd2a45b83e50c0f33b01ee74df241f1adfdff39.tar.xz
Refuse updating the current branch in a non-bare repository via push
This makes git-push refuse pushing into a non-bare repository to update the current branch by default. To help people who are used to be able to do this (and later "reset --hard" it in some other way), an error message is issued when this refusal is triggered, instructing how to resurrect the old behaviour. Hosting sites that do not give the users direct access to customize their repositories (e.g. repo.or.cz, gitorious, github etc.) may further want to explicitly set the configuration variable to "refuse" for their customers' repositories. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5522-pull-symlink.sh')
-rwxr-xr-xt/t5522-pull-symlink.sh20
1 files changed, 13 insertions, 7 deletions
diff --git a/t/t5522-pull-symlink.sh b/t/t5522-pull-symlink.sh
index 86bbd7d02..7206817ca 100755
--- a/t/t5522-pull-symlink.sh
+++ b/t/t5522-pull-symlink.sh
@@ -20,13 +20,19 @@ fi
#
# The working directory is subdir-link.
-mkdir subdir
-echo file >subdir/file
-git add subdir/file
-git commit -q -m file
-git clone -q . clone-repo
-ln -s clone-repo/subdir/ subdir-link
-
+test_expect_success setup '
+ mkdir subdir &&
+ echo file >subdir/file &&
+ git add subdir/file &&
+ git commit -q -m file &&
+ git clone -q . clone-repo &&
+ ln -s clone-repo/subdir/ subdir-link &&
+ (
+ cd clone-repo &&
+ git config receive.denyCurrentBranch warn
+ ) &&
+ git config receive.denyCurrentBranch warn
+'
# Demonstrate that things work if we just avoid the symlink
#