diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:48:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-10 00:48:47 -0800 |
| commit | 96aa7adda3b0254e4b9904f53bb38cd76bfea7bb (patch) | |
| tree | d1eb57fbedb2e8c321889794c60ded86a9a2e88b /t | |
| parent | 70d7099916c9621e157c620f9cc7fc982f109c55 (diff) | |
| parent | 0606c36a73449e76d8f6133253c1eff291ee8c97 (diff) | |
| download | git-96aa7adda3b0254e4b9904f53bb38cd76bfea7bb.tar.gz git-96aa7adda3b0254e4b9904f53bb38cd76bfea7bb.tar.xz | |
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0:
base85: Make the code more obvious instead of explaining the non-obvious
base85: encode_85() does not use the decode table
base85 debug code: Fix length byte calculation
checkout -m: do not try to fall back to --merge from an unborn branch
branch: die explicitly why when calling "git branch [-a|-r] branchname".
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5403-post-checkout-hook.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh index 9b2e1a94c..a7bef9371 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 |