summaryrefslogtreecommitdiff
path: root/t/t5403-post-checkout-hook.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-31 23:00:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-31 23:00:14 (GMT)
commit9bfff3ae5fdf1dcd0705056f7f9a42e81548797e (patch)
tree509488d440f0f8a7228189ce94e66d5acce5757f /t/t5403-post-checkout-hook.sh
parent74fbd1182a8300dd0a1d788120813b6d5b9e5cb6 (diff)
parent6e8f993a5a17f71edfd26a026bbc83cbbd3c0638 (diff)
downloadgit-9bfff3ae5fdf1dcd0705056f7f9a42e81548797e.zip
git-9bfff3ae5fdf1dcd0705056f7f9a42e81548797e.tar.gz
git-9bfff3ae5fdf1dcd0705056f7f9a42e81548797e.tar.bz2
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0: branch: die explicitly why when calling "git branch [-a|-r] branchname".
Diffstat (limited to 't/t5403-post-checkout-hook.sh')
-rwxr-xr-xt/t5403-post-checkout-hook.sh26
1 files changed, 13 insertions, 13 deletions
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index 5858b86..d05a913 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -7,19 +7,19 @@ test_description='Test the post-checkout hook.'
. ./test-lib.sh
test_expect_success setup '
- echo Data for commit0. >a &&
- echo Data for commit0. >b &&
- git update-index --add a &&
- git update-index --add b &&
- tree0=$(git write-tree) &&
- commit0=$(echo setup | git commit-tree $tree0) &&
- git update-ref refs/heads/master $commit0 &&
- git clone ./. clone1 &&
- git clone ./. clone2 &&
- GIT_DIR=clone2/.git git branch -a new2 &&
- echo Data for commit1. >clone2/b &&
- GIT_DIR=clone2/.git git add clone2/b &&
- GIT_DIR=clone2/.git git commit -m new2
+ echo Data for commit0. >a &&
+ echo Data for commit0. >b &&
+ git update-index --add a &&
+ git update-index --add b &&
+ tree0=$(git write-tree) &&
+ commit0=$(echo setup | git commit-tree $tree0) &&
+ git update-ref refs/heads/master $commit0 &&
+ git clone ./. clone1 &&
+ git clone ./. clone2 &&
+ GIT_DIR=clone2/.git git branch new2 &&
+ echo Data for commit1. >clone2/b &&
+ GIT_DIR=clone2/.git git add clone2/b &&
+ GIT_DIR=clone2/.git git commit -m new2
'
for clone in 1 2; do