diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-31 15:00:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-31 15:00:38 -0800 |
| commit | 37bae10e38a66e4f1ddd5350daded00b21735126 (patch) | |
| tree | 1fbb3d5578e5bf0ed53503a6156535db96b83050 /t | |
| parent | 4cc47382dfc2a71257934042f6c009287e101cb3 (diff) | |
| parent | 9bfff3ae5fdf1dcd0705056f7f9a42e81548797e (diff) | |
| download | git-37bae10e38a66e4f1ddd5350daded00b21735126.tar.gz git-37bae10e38a66e4f1ddd5350daded00b21735126.tar.xz | |
Merge branch 'maint'
* maint:
branch: die explicitly why when calling "git branch [-a|-r] branchname".
fast-import: Document author/committer/tagger name is optional
SubmittingPatches: hints to know the status of a submitted patch.
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 5858b868e..d05a9138b 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 |