mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rr/test-3200-style' into maint

Browse Source 
* rr/test-3200-style:
  t3200 (branch): modernize style

Conflicts:
	t/t3200-branch.sh
This commit is contained in:
Junio C Hamano
2013-04-12 13:41:48 -07:00
parent 97ff97dc05 0d158ebb92
commit a46221e9ad
1 changed files with 253 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

270
t/t3200-branch.sh
View File

@ -7,18 +7,16 @@ test_description='git branch assorted tests'
. ./test-lib.sh . ./test-lib.sh
test_expect_success \ test_expect_success 'prepare a trivial repository' '
'prepare a trivial repository' \ echo Hello >A &&
'echo Hello > A &&
git update-index --add A && git update-index --add A &&
git commit -m "Initial commit." && git commit -m "Initial commit." &&
echo World >> A && echo World >>A &&
git update-index --add A && git update-index --add A &&
git commit -m "Second commit." && git commit -m "Second commit." &&
HEAD=$(git rev-parse --verify HEAD)' HEAD=$(git rev-parse --verify HEAD)'
test_expect_success \ test_expect_success 'git branch --help should not have created a bogus branch' '
'git branch --help should not have created a bogus branch' '
test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null && test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&
test_path_is_missing .git/refs/heads/--help test_path_is_missing .git/refs/heads/--help
' '
@ -34,63 +32,63 @@ test_expect_success 'branch -h in broken repository' '
test_i18ngrep "[Uu]sage" broken/usage test_i18ngrep "[Uu]sage" broken/usage
' '
test_expect_success \ test_expect_success 'git branch abc should create a branch' '
'git branch abc should create a branch' \ git branch abc && test_path_is_file .git/refs/heads/abc
'git branch abc && test_path_is_file .git/refs/heads/abc' '
test_expect_success \ test_expect_success 'git branch a/b/c should create a branch' '
'git branch a/b/c should create a branch' \ git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
'git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c' '
test_expect_success \ test_expect_success 'git branch HEAD should fail' '
'git branch HEAD should fail' \ test_must_fail git branch HEAD
'test_must_fail git branch HEAD' '
cat >expect <<EOF cat >expect <<EOF
$_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
EOF EOF
test_expect_success \ test_expect_success 'git branch -l d/e/f should create a branch and a log' '
'git branch -l d/e/f should create a branch and a log' \ GIT_COMMITTER_DATE="2005-05-26 23:30" \
'GIT_COMMITTER_DATE="2005-05-26 23:30" \
git branch -l d/e/f && git branch -l d/e/f &&
test_path_is_file .git/refs/heads/d/e/f && test_path_is_file .git/refs/heads/d/e/f &&
test_path_is_file .git/logs/refs/heads/d/e/f && test_path_is_file .git/logs/refs/heads/d/e/f &&
test_cmp expect .git/logs/refs/heads/d/e/f' test_cmp expect .git/logs/refs/heads/d/e/f
'
test_expect_success \ test_expect_success 'git branch -d d/e/f should delete a branch and a log' '
'git branch -d d/e/f should delete a branch and a log' \ git branch -d d/e/f &&
'git branch -d d/e/f &&
test_path_is_missing .git/refs/heads/d/e/f && test_path_is_missing .git/refs/heads/d/e/f &&
test_path_is_missing .git/logs/refs/heads/d/e/f' test_path_is_missing .git/logs/refs/heads/d/e/f
'
test_expect_success \ test_expect_success 'git branch j/k should work after branch j has been deleted' '
'git branch j/k should work after branch j has been deleted' \ git branch j &&
'git branch j &&
git branch -d j && git branch -d j &&
git branch j/k' git branch j/k
'
test_expect_success \ test_expect_success 'git branch l should work after branch l/m has been deleted' '
'git branch l should work after branch l/m has been deleted' \ git branch l/m &&
'git branch l/m &&
git branch -d l/m && git branch -d l/m &&
git branch l' git branch l
'
test_expect_success \ test_expect_success 'git branch -m dumps usage' '
'git branch -m dumps usage' \ test_expect_code 128 git branch -m 2>err &&
'test_expect_code 128 git branch -m 2>err && test_i18ngrep "too many branches for a rename operation" err
test_i18ngrep "too many branches for a rename operation" err' '
test_expect_success \ test_expect_success 'git branch -m m m/m should work' '
'git branch -m m m/m should work' \ git branch -l m &&
'git branch -l m &&
git branch -m m m/m && git branch -m m m/m &&
test_path_is_file .git/logs/refs/heads/m/m' test_path_is_file .git/logs/refs/heads/m/m
'
test_expect_success \ test_expect_success 'git branch -m n/n n should work' '
'git branch -m n/n n should work' \ git branch -l n/n &&
'git branch -l n/n &&
git branch -m n/n n && git branch -m n/n n &&
test_path_is_file .git/logs/refs/heads/n' test_path_is_file .git/logs/refs/heads/n
'
test_expect_success 'git branch -m o/o o should fail when o/p exists' ' test_expect_success 'git branch -m o/o o should fail when o/p exists' '
git branch o/o && git branch o/o &&
@ -252,19 +250,20 @@ mv .git/config-saved .git/config
git config branch.s/s.dummy Hello git config branch.s/s.dummy Hello
test_expect_success \ test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
'git branch -m s/s s should work when s/t is deleted' \ git branch -l s/s &&
'git branch -l s/s &&
test_path_is_file .git/logs/refs/heads/s/s && test_path_is_file .git/logs/refs/heads/s/s &&
git branch -l s/t && git branch -l s/t &&
test_path_is_file .git/logs/refs/heads/s/t && test_path_is_file .git/logs/refs/heads/s/t &&
git branch -d s/t && git branch -d s/t &&
git branch -m s/s s && git branch -m s/s s &&
test_path_is_file .git/logs/refs/heads/s' test_path_is_file .git/logs/refs/heads/s
'
test_expect_success 'config information was renamed, too' \ test_expect_success 'config information was renamed, too' '
"test $(git config branch.s.dummy) = Hello && test $(git config branch.s.dummy) = Hello &&
test_must_fail git config branch.s/s/dummy" test_must_fail git config branch.s/s/dummy
'
test_expect_success 'deleting a symref' ' test_expect_success 'deleting a symref' '
git branch target && git branch target &&
@ -285,8 +284,7 @@ test_expect_success 'deleting a dangling symref' '
test_i18ncmp expect actual test_i18ncmp expect actual
' '
test_expect_success 'renaming a symref is not allowed' \ test_expect_success 'renaming a symref is not allowed' '
'
git symbolic-ref refs/heads/master2 refs/heads/master && git symbolic-ref refs/heads/master2 refs/heads/master &&
test_must_fail git branch -m master2 master3 && test_must_fail git branch -m master2 master3 &&
git symbolic-ref refs/heads/master2 && git symbolic-ref refs/heads/master2 &&
@ -294,131 +292,145 @@ test_expect_success 'renaming a symref is not allowed' \
test_path_is_missing .git/refs/heads/master3 test_path_is_missing .git/refs/heads/master3
' '
test_expect_success SYMLINKS \ test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '
'git branch -m u v should fail when the reflog for u is a symlink' '
git branch -l u && git branch -l u &&
mv .git/logs/refs/heads/u real-u && mv .git/logs/refs/heads/u real-u &&
ln -s real-u .git/logs/refs/heads/u && ln -s real-u .git/logs/refs/heads/u &&
test_must_fail git branch -m u v test_must_fail git branch -m u v
' '
test_expect_success 'test tracking setup via --track' \ test_expect_success 'test tracking setup via --track' '
'git config remote.local.url . && git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* && git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
(git show-ref -q refs/remotes/local/master || git fetch local) && (git show-ref -q refs/remotes/local/master || git fetch local) &&
git branch --track my1 local/master && git branch --track my1 local/master &&
test $(git config branch.my1.remote) = local && test $(git config branch.my1.remote) = local &&
test $(git config branch.my1.merge) = refs/heads/master' test $(git config branch.my1.merge) = refs/heads/master
'
test_expect_success 'test tracking setup (non-wildcard, matching)' \ test_expect_success 'test tracking setup (non-wildcard, matching)' '
'git config remote.local.url . && git config remote.local.url . &&
git config remote.local.fetch refs/heads/master:refs/remotes/local/master && git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
(git show-ref -q refs/remotes/local/master || git fetch local) && (git show-ref -q refs/remotes/local/master || git fetch local) &&
git branch --track my4 local/master && git branch --track my4 local/master &&
test $(git config branch.my4.remote) = local && test $(git config branch.my4.remote) = local &&
test $(git config branch.my4.merge) = refs/heads/master' test $(git config branch.my4.merge) = refs/heads/master
'
test_expect_success 'test tracking setup (non-wildcard, not matching)' \ test_expect_success 'test tracking setup (non-wildcard, not matching)' '
'git config remote.local.url . && git config remote.local.url . &&
git config remote.local.fetch refs/heads/s:refs/remotes/local/s && git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
(git show-ref -q refs/remotes/local/master || git fetch local) && (git show-ref -q refs/remotes/local/master || git fetch local) &&
git branch --track my5 local/master && git branch --track my5 local/master &&
! test "$(git config branch.my5.remote)" = local && ! test "$(git config branch.my5.remote)" = local &&
! test "$(git config branch.my5.merge)" = refs/heads/master' ! test "$(git config branch.my5.merge)" = refs/heads/master
'
test_expect_success 'test tracking setup via config' \ test_expect_success 'test tracking setup via config' '
'git config branch.autosetupmerge true && git config branch.autosetupmerge true &&
git config remote.local.url . && git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* && git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
(git show-ref -q refs/remotes/local/master || git fetch local) && (git show-ref -q refs/remotes/local/master || git fetch local) &&
git branch my3 local/master && git branch my3 local/master &&
test $(git config branch.my3.remote) = local && test $(git config branch.my3.remote) = local &&
test $(git config branch.my3.merge) = refs/heads/master' test $(git config branch.my3.merge) = refs/heads/master
'
test_expect_success 'test overriding tracking setup via --no-track' \ test_expect_success 'test overriding tracking setup via --no-track' '
'git config branch.autosetupmerge true && git config branch.autosetupmerge true &&
git config remote.local.url . && git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* && git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
(git show-ref -q refs/remotes/local/master || git fetch local) && (git show-ref -q refs/remotes/local/master || git fetch local) &&
git branch --no-track my2 local/master && git branch --no-track my2 local/master &&
git config branch.autosetupmerge false && git config branch.autosetupmerge false &&
! test "$(git config branch.my2.remote)" = local && ! test "$(git config branch.my2.remote)" = local &&
! test "$(git config branch.my2.merge)" = refs/heads/master' ! test "$(git config branch.my2.merge)" = refs/heads/master
'
test_expect_success 'no tracking without .fetch entries' \ test_expect_success 'no tracking without .fetch entries' '
'git config branch.autosetupmerge true && git config branch.autosetupmerge true &&
git branch my6 s && git branch my6 s &&
git config branch.automsetupmerge false && git config branch.automsetupmerge false &&
test -z "$(git config branch.my6.remote)" && test -z "$(git config branch.my6.remote)" &&
test -z "$(git config branch.my6.merge)"' test -z "$(git config branch.my6.merge)"
'
test_expect_success 'test tracking setup via --track but deeper' \ test_expect_success 'test tracking setup via --track but deeper' '
'git config remote.local.url . && git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* && git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
(git show-ref -q refs/remotes/local/o/o || git fetch local) && (git show-ref -q refs/remotes/local/o/o || git fetch local) &&
git branch --track my7 local/o/o && git branch --track my7 local/o/o &&
test "$(git config branch.my7.remote)" = local && test "$(git config branch.my7.remote)" = local &&
test "$(git config branch.my7.merge)" = refs/heads/o/o' test "$(git config branch.my7.merge)" = refs/heads/o/o
'
test_expect_success 'test deleting branch deletes branch config' \ test_expect_success 'test deleting branch deletes branch config' '
'git branch -d my7 && git branch -d my7 &&
test -z "$(git config branch.my7.remote)" && test -z "$(git config branch.my7.remote)" &&
test -z "$(git config branch.my7.merge)"' test -z "$(git config branch.my7.merge)"
'
test_expect_success 'test deleting branch without config' \ test_expect_success 'test deleting branch without config' '
'git branch my7 s && git branch my7 s &&
sha1=$(git rev-parse my7 | cut -c 1-7) && sha1=$(git rev-parse my7 | cut -c 1-7) &&
echo "Deleted branch my7 (was $sha1)." >expect && echo "Deleted branch my7 (was $sha1)." >expect &&
git branch -d my7 >actual 2>&1 && git branch -d my7 >actual 2>&1 &&
test_i18ncmp expect actual' test_i18ncmp expect actual
'
test_expect_success 'test --track without .fetch entries' \ test_expect_success 'test --track without .fetch entries' '
'git branch --track my8 && git branch --track my8 &&
test "$(git config branch.my8.remote)" && test "$(git config branch.my8.remote)" &&
test "$(git config branch.my8.merge)"' test "$(git config branch.my8.merge)"
'
test_expect_success \ test_expect_success 'branch from non-branch HEAD w/autosetupmerge=always' '
'branch from non-branch HEAD w/autosetupmerge=always' \ git config branch.autosetupmerge always &&
'git config branch.autosetupmerge always &&
git branch my9 HEAD^ && git branch my9 HEAD^ &&
git config branch.autosetupmerge false' git config branch.autosetupmerge false
'
test_expect_success \ test_expect_success 'branch from non-branch HEAD w/--track causes failure' '
'branch from non-branch HEAD w/--track causes failure' \ test_must_fail git branch --track my10 HEAD^
'test_must_fail git branch --track my10 HEAD^' '
test_expect_success \ test_expect_success 'branch from tag w/--track causes failure' '
'branch from tag w/--track causes failure' \ git tag foobar &&
'git tag foobar && test_must_fail git branch --track my11 foobar
test_must_fail git branch --track my11 foobar' '
test_expect_success '--set-upstream-to fails on multiple branches' \ test_expect_success '--set-upstream-to fails on multiple branches' '
'test_must_fail git branch --set-upstream-to master a b c' test_must_fail git branch --set-upstream-to master a b c
'
test_expect_success '--set-upstream-to fails on detached HEAD' \ test_expect_success '--set-upstream-to fails on detached HEAD' '
'git checkout HEAD^{} && git checkout HEAD^{} &&
test_must_fail git branch --set-upstream-to master && test_must_fail git branch --set-upstream-to master &&
git checkout -' git checkout -
'
test_expect_success 'use --set-upstream-to modify HEAD' \ test_expect_success 'use --set-upstream-to modify HEAD' '
'test_config branch.master.remote foo && test_config branch.master.remote foo &&
test_config branch.master.merge foo && test_config branch.master.merge foo &&
git branch my12 git branch my12
git branch --set-upstream-to my12 && git branch --set-upstream-to my12 &&
test "$(git config branch.master.remote)" = "." && test "$(git config branch.master.remote)" = "." &&
test "$(git config branch.master.merge)" = "refs/heads/my12"' test "$(git config branch.master.merge)" = "refs/heads/my12"
'
test_expect_success 'use --set-upstream-to modify a particular branch' \ test_expect_success 'use --set-upstream-to modify a particular branch' '
'git branch my13 git branch my13
git branch --set-upstream-to master my13 && git branch --set-upstream-to master my13 &&
test "$(git config branch.my13.remote)" = "." && test "$(git config branch.my13.remote)" = "." &&
test "$(git config branch.my13.merge)" = "refs/heads/master"' test "$(git config branch.my13.merge)" = "refs/heads/master"
'
test_expect_success '--unset-upstream should fail if given a non-existent branch' \ test_expect_success '--unset-upstream should fail if given a non-existent branch' '
'test_must_fail git branch --unset-upstream i-dont-exist' test_must_fail git branch --unset-upstream i-dont-exist
'
test_expect_success 'test --unset-upstream on HEAD' \ test_expect_success 'test --unset-upstream on HEAD' '
'git branch my14 git branch my14
test_config branch.master.remote foo && test_config branch.master.remote foo &&
test_config branch.master.merge foo && test_config branch.master.merge foo &&
git branch --set-upstream-to my14 && git branch --set-upstream-to my14 &&
@ -429,24 +441,26 @@ test_expect_success 'test --unset-upstream on HEAD' \
test_must_fail git branch --unset-upstream test_must_fail git branch --unset-upstream
' '
test_expect_success '--unset-upstream should fail on multiple branches' \ test_expect_success '--unset-upstream should fail on multiple branches' '
'test_must_fail git branch --unset-upstream a b c' test_must_fail git branch --unset-upstream a b c
'
test_expect_success '--unset-upstream should fail on detached HEAD' \ test_expect_success '--unset-upstream should fail on detached HEAD' '
'git checkout HEAD^{} && git checkout HEAD^{} &&
test_must_fail git branch --unset-upstream && test_must_fail git branch --unset-upstream &&
git checkout - git checkout -
' '
test_expect_success 'test --unset-upstream on a particular branch' \ test_expect_success 'test --unset-upstream on a particular branch' '
'git branch my15 git branch my15
git branch --set-upstream-to master my14 && git branch --set-upstream-to master my14 &&
git branch --unset-upstream my14 && git branch --unset-upstream my14 &&
test_must_fail git config branch.my14.remote && test_must_fail git config branch.my14.remote &&
test_must_fail git config branch.my14.merge' test_must_fail git config branch.my14.merge
'
test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' \ test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' '
'git update-ref refs/remotes/origin/master HEAD && git update-ref refs/remotes/origin/master HEAD &&
git branch --set-upstream origin/master 2>actual && git branch --set-upstream origin/master 2>actual &&
test_when_finished git update-ref -d refs/remotes/origin/master && test_when_finished git update-ref -d refs/remotes/origin/master &&
test_when_finished git branch -d origin/master && test_when_finished git branch -d origin/master &&
@ -461,8 +475,8 @@ EOF
test_cmp expected actual test_cmp expected actual
' '
test_expect_success '--set-upstream with two args only shows the deprecation message' \ test_expect_success '--set-upstream with two args only shows the deprecation message' '
'git branch --set-upstream master my13 2>actual && git branch --set-upstream master my13 2>actual &&
test_when_finished git branch --unset-upstream master && test_when_finished git branch --unset-upstream master &&
cat >expected <<EOF && cat >expected <<EOF &&
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
@ -470,8 +484,8 @@ EOF
test_cmp expected actual test_cmp expected actual
' '
test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' \ test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '
'git branch --set-upstream my13 2>actual && git branch --set-upstream my13 2>actual &&
test_when_finished git branch --unset-upstream my13 && test_when_finished git branch --unset-upstream my13 &&
cat >expected <<EOF && cat >expected <<EOF &&
The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
@ -483,13 +497,13 @@ EOF
cat >expect <<EOF cat >expect <<EOF
$_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
EOF EOF
test_expect_success \ test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' '
'git checkout -b g/h/i -l should create a branch and a log' \ GIT_COMMITTER_DATE="2005-05-26 23:30" \
'GIT_COMMITTER_DATE="2005-05-26 23:30" \
git checkout -b g/h/i -l master && git checkout -b g/h/i -l master &&
test_path_is_file .git/refs/heads/g/h/i && test_path_is_file .git/refs/heads/g/h/i &&
test_path_is_file .git/logs/refs/heads/g/h/i && test_path_is_file .git/logs/refs/heads/g/h/i &&
test_cmp expect .git/logs/refs/heads/g/h/i' test_cmp expect .git/logs/refs/heads/g/h/i
'
test_expect_success 'checkout -b makes reflog by default' ' test_expect_success 'checkout -b makes reflog by default' '
git checkout master && git checkout master &&
@ -760,7 +774,7 @@ test_expect_success 'detect misconfigured autosetuprebase (bad value)' '
test_expect_success 'detect misconfigured autosetuprebase (no value)' ' test_expect_success 'detect misconfigured autosetuprebase (no value)' '
git config --unset branch.autosetuprebase && git config --unset branch.autosetuprebase &&
echo "[branch] autosetuprebase" >> .git/config && echo "[branch] autosetuprebase" >>.git/config &&
test_must_fail git branch && test_must_fail git branch &&
git config --unset branch.autosetuprebase git config --unset branch.autosetuprebase
' '