From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Apr 2013 20:41:48 +0000 (-0700)
Subject: Merge branch 'rr/test-3200-style' into maint
X-Git-Tag: v1.8.2.2~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a46221e9adcf3deb88c4fc904859205bf87f784c;p=git

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

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

Conflicts:
	t/t3200-branch.sh
---

a46221e9adcf3deb88c4fc904859205bf87f784c
diff --cc t/t3200-branch.sh
index 12f1e4a63c,74fbba1a56..b08c9f2295
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@@ -34,18 -32,14 +32,18 @@@ test_expect_success 'branch -h in broke
  	test_i18ngrep "[Uu]sage" broken/usage
  '
  
- test_expect_success \
-     'git branch abc should create a branch' \
-     'git branch abc && test_path_is_file .git/refs/heads/abc'
+ test_expect_success 'git branch abc should create a branch' '
+ 	git branch abc && test_path_is_file .git/refs/heads/abc
+ '
  
- test_expect_success \
-     'git branch a/b/c should create a branch' \
-     'git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c'
+ test_expect_success 'git branch a/b/c should create a branch' '
+ 	git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
+ '
  
- test_expect_success \
-     'git branch HEAD should fail' \
-     'test_must_fail git branch HEAD'
++test_expect_success 'git branch HEAD should fail' '
++	test_must_fail git branch HEAD
++'
 +
  cat >expect <<EOF
  $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000	branch: Created from master
  EOF
@@@ -294,163 -288,159 +292,179 @@@ test_expect_success 'renaming a symref 
  	test_path_is_missing .git/refs/heads/master3
  '
  
- test_expect_success SYMLINKS \
-     'git branch -m u v should fail when the reflog for u is a symlink' '
-      git branch -l u &&
-      mv .git/logs/refs/heads/u real-u &&
-      ln -s real-u .git/logs/refs/heads/u &&
-      test_must_fail git branch -m u v
- '
- 
- test_expect_success 'test tracking setup via --track' \
-     'git config remote.local.url . &&
-      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-      (git show-ref -q refs/remotes/local/master || git fetch local) &&
-      git branch --track my1 local/master &&
-      test $(git config branch.my1.remote) = local &&
-      test $(git config branch.my1.merge) = refs/heads/master'
- 
- test_expect_success 'test tracking setup (non-wildcard, matching)' \
-     'git config remote.local.url . &&
-      git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
-      (git show-ref -q refs/remotes/local/master || git fetch local) &&
-      git branch --track my4 local/master &&
-      test $(git config branch.my4.remote) = local &&
-      test $(git config branch.my4.merge) = refs/heads/master'
- 
- test_expect_success 'test tracking setup (non-wildcard, not matching)' \
-     'git config remote.local.url . &&
-      git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
-      (git show-ref -q refs/remotes/local/master || git fetch local) &&
-      git branch --track my5 local/master &&
-      ! test "$(git config branch.my5.remote)" = local &&
-      ! test "$(git config branch.my5.merge)" = refs/heads/master'
- 
- test_expect_success 'test tracking setup via config' \
-     'git config branch.autosetupmerge true &&
-      git config remote.local.url . &&
-      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-      (git show-ref -q refs/remotes/local/master || git fetch local) &&
-      git branch my3 local/master &&
-      test $(git config branch.my3.remote) = local &&
-      test $(git config branch.my3.merge) = refs/heads/master'
- 
- test_expect_success 'test overriding tracking setup via --no-track' \
-     'git config branch.autosetupmerge true &&
-      git config remote.local.url . &&
-      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-      (git show-ref -q refs/remotes/local/master || git fetch local) &&
-      git branch --no-track my2 local/master &&
-      git config branch.autosetupmerge false &&
-      ! test "$(git config branch.my2.remote)" = local &&
-      ! test "$(git config branch.my2.merge)" = refs/heads/master'
- 
- test_expect_success 'no tracking without .fetch entries' \
-     'git config branch.autosetupmerge true &&
-      git branch my6 s &&
-      git config branch.automsetupmerge false &&
-      test -z "$(git config branch.my6.remote)" &&
-      test -z "$(git config branch.my6.merge)"'
- 
- test_expect_success 'test tracking setup via --track but deeper' \
-     'git config remote.local.url . &&
-      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-      (git show-ref -q refs/remotes/local/o/o || git fetch local) &&
-      git branch --track my7 local/o/o &&
-      test "$(git config branch.my7.remote)" = local &&
-      test "$(git config branch.my7.merge)" = refs/heads/o/o'
- 
- test_expect_success 'test deleting branch deletes branch config' \
-     'git branch -d my7 &&
-      test -z "$(git config branch.my7.remote)" &&
-      test -z "$(git config branch.my7.merge)"'
- 
- test_expect_success 'test deleting branch without config' \
-     'git branch my7 s &&
-      sha1=$(git rev-parse my7 | cut -c 1-7) &&
-      echo "Deleted branch my7 (was $sha1)." >expect &&
-      git branch -d my7 >actual 2>&1 &&
-      test_i18ncmp expect actual'
- 
- test_expect_success 'test --track without .fetch entries' \
-     'git branch --track my8 &&
-      test "$(git config branch.my8.remote)" &&
-      test "$(git config branch.my8.merge)"'
- 
- test_expect_success \
-     'branch from non-branch HEAD w/autosetupmerge=always' \
-     'git config branch.autosetupmerge always &&
-      git branch my9 HEAD^ &&
-      git config branch.autosetupmerge false'
- 
- test_expect_success \
-     'branch from non-branch HEAD w/--track causes failure' \
-     'test_must_fail git branch --track my10 HEAD^'
- 
- test_expect_success \
-     'branch from tag w/--track causes failure' \
-     'git tag foobar &&
-      test_must_fail git branch --track my11 foobar'
- 
- test_expect_success '--set-upstream-to fails on multiple branches' \
-     'test_must_fail git branch --set-upstream-to master a b c'
- 
- test_expect_success '--set-upstream-to fails on detached HEAD' \
-     'git checkout HEAD^{} &&
-      test_must_fail git branch --set-upstream-to master &&
-      git checkout -'
- 
- test_expect_success 'use --set-upstream-to modify HEAD' \
-     'test_config branch.master.remote foo &&
-      test_config branch.master.merge foo &&
-      git branch my12
-      git branch --set-upstream-to my12 &&
-      test "$(git config branch.master.remote)" = "." &&
-      test "$(git config branch.master.merge)" = "refs/heads/my12"'
- 
- test_expect_success 'use --set-upstream-to modify a particular branch' \
-     'git branch my13
-      git branch --set-upstream-to master my13 &&
-      test "$(git config branch.my13.remote)" = "." &&
-      test "$(git config branch.my13.merge)" = "refs/heads/master"'
- 
- test_expect_success '--unset-upstream should fail if given a non-existent branch' \
-     'test_must_fail git branch --unset-upstream i-dont-exist'
- 
- test_expect_success 'test --unset-upstream on HEAD' \
-     'git branch my14
-      test_config branch.master.remote foo &&
-      test_config branch.master.merge foo &&
-      git branch --set-upstream-to my14 &&
-      git branch --unset-upstream &&
-      test_must_fail git config branch.master.remote &&
-      test_must_fail git config branch.master.merge &&
-      # fail for a branch without upstream set
-      test_must_fail git branch --unset-upstream
- '
- 
- test_expect_success '--unset-upstream should fail on multiple branches' \
-     'test_must_fail git branch --unset-upstream a b c'
- 
- test_expect_success '--unset-upstream should fail on detached HEAD' \
-     'git checkout HEAD^{} &&
-      test_must_fail git branch --unset-upstream &&
-      git checkout -
- '
- 
- test_expect_success 'test --unset-upstream on a particular branch' \
-     'git branch my15
-      git branch --set-upstream-to master my14 &&
-      git branch --unset-upstream my14 &&
-      test_must_fail git config branch.my14.remote &&
-      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' \
-     'git update-ref refs/remotes/origin/master HEAD &&
-      git branch --set-upstream origin/master 2>actual &&
-      test_when_finished git update-ref -d refs/remotes/origin/master &&
-      test_when_finished git branch -d origin/master &&
-      cat >expected <<EOF &&
+ test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '
+ 	git branch -l u &&
+ 	mv .git/logs/refs/heads/u real-u &&
+ 	ln -s real-u .git/logs/refs/heads/u &&
+ 	test_must_fail git branch -m u v
+ '
+ 
+ test_expect_success 'test tracking setup via --track' '
+ 	git config remote.local.url . &&
+ 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+ 	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+ 	git branch --track my1 local/master &&
+ 	test $(git config branch.my1.remote) = local &&
+ 	test $(git config branch.my1.merge) = refs/heads/master
+ '
+ 
+ test_expect_success 'test tracking setup (non-wildcard, matching)' '
+ 	git config remote.local.url . &&
+ 	git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
+ 	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+ 	git branch --track my4 local/master &&
+ 	test $(git config branch.my4.remote) = local &&
+ 	test $(git config branch.my4.merge) = refs/heads/master
+ '
+ 
+ test_expect_success 'test tracking setup (non-wildcard, not matching)' '
+ 	git config remote.local.url . &&
+ 	git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
+ 	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+ 	git branch --track my5 local/master &&
+ 	! test "$(git config branch.my5.remote)" = local &&
+ 	! test "$(git config branch.my5.merge)" = refs/heads/master
+ '
+ 
+ test_expect_success 'test tracking setup via config' '
+ 	git config branch.autosetupmerge true &&
+ 	git config remote.local.url . &&
+ 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+ 	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+ 	git branch my3 local/master &&
+ 	test $(git config branch.my3.remote) = local &&
+ 	test $(git config branch.my3.merge) = refs/heads/master
+ '
+ 
+ test_expect_success 'test overriding tracking setup via --no-track' '
+ 	git config branch.autosetupmerge true &&
+ 	git config remote.local.url . &&
+ 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+ 	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+ 	git branch --no-track my2 local/master &&
+ 	git config branch.autosetupmerge false &&
+ 	! test "$(git config branch.my2.remote)" = local &&
+ 	! test "$(git config branch.my2.merge)" = refs/heads/master
+ '
+ 
+ test_expect_success 'no tracking without .fetch entries' '
+ 	git config branch.autosetupmerge true &&
+ 	git branch my6 s &&
+ 	git config branch.automsetupmerge false &&
+ 	test -z "$(git config branch.my6.remote)" &&
+ 	test -z "$(git config branch.my6.merge)"
+ '
+ 
+ test_expect_success 'test tracking setup via --track but deeper' '
+ 	git config remote.local.url . &&
+ 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
+ 	(git show-ref -q refs/remotes/local/o/o || git fetch local) &&
+ 	git branch --track my7 local/o/o &&
+ 	test "$(git config branch.my7.remote)" = local &&
+ 	test "$(git config branch.my7.merge)" = refs/heads/o/o
+ '
+ 
+ test_expect_success 'test deleting branch deletes branch config' '
+ 	git branch -d my7 &&
+ 	test -z "$(git config branch.my7.remote)" &&
+ 	test -z "$(git config branch.my7.merge)"
+ '
+ 
+ test_expect_success 'test deleting branch without config' '
+ 	git branch my7 s &&
+ 	sha1=$(git rev-parse my7 | cut -c 1-7) &&
+ 	echo "Deleted branch my7 (was $sha1)." >expect &&
+ 	git branch -d my7 >actual 2>&1 &&
+ 	test_i18ncmp expect actual
+ '
+ 
+ test_expect_success 'test --track without .fetch entries' '
+ 	git branch --track my8 &&
+ 	test "$(git config branch.my8.remote)" &&
+ 	test "$(git config branch.my8.merge)"
+ '
+ 
+ test_expect_success 'branch from non-branch HEAD w/autosetupmerge=always' '
+ 	git config branch.autosetupmerge always &&
+ 	git branch my9 HEAD^ &&
+ 	git config branch.autosetupmerge false
+ '
+ 
+ test_expect_success 'branch from non-branch HEAD w/--track causes failure' '
+ 	test_must_fail git branch --track my10 HEAD^
+ '
+ 
+ test_expect_success 'branch from tag w/--track causes failure' '
+ 	git tag foobar &&
+ 	test_must_fail git branch --track my11 foobar
+ '
+ 
++test_expect_success '--set-upstream-to fails on multiple branches' '
++	test_must_fail git branch --set-upstream-to master a b c
++'
++
++test_expect_success '--set-upstream-to fails on detached HEAD' '
++	git checkout HEAD^{} &&
++	test_must_fail git branch --set-upstream-to master &&
++	git checkout -
++'
++
+ test_expect_success 'use --set-upstream-to modify HEAD' '
+ 	test_config branch.master.remote foo &&
+ 	test_config branch.master.merge foo &&
+ 	git branch my12
+ 	git branch --set-upstream-to my12 &&
+ 	test "$(git config branch.master.remote)" = "." &&
+ 	test "$(git config branch.master.merge)" = "refs/heads/my12"
+ '
+ 
+ test_expect_success 'use --set-upstream-to modify a particular branch' '
+ 	git branch my13
+ 	git branch --set-upstream-to master my13 &&
+ 	test "$(git config branch.my13.remote)" = "." &&
+ 	test "$(git config branch.my13.merge)" = "refs/heads/master"
+ '
+ 
+ test_expect_success '--unset-upstream should fail if given a non-existent branch' '
+ 	test_must_fail git branch --unset-upstream i-dont-exist
+ '
+ 
+ test_expect_success 'test --unset-upstream on HEAD' '
+ 	git branch my14
+ 	test_config branch.master.remote foo &&
+ 	test_config branch.master.merge foo &&
+ 	git branch --set-upstream-to my14 &&
+ 	git branch --unset-upstream &&
+ 	test_must_fail git config branch.master.remote &&
+ 	test_must_fail git config branch.master.merge &&
+ 	# fail for a branch without upstream set
+ 	test_must_fail git branch --unset-upstream
+ '
+ 
++test_expect_success '--unset-upstream should fail on multiple branches' '
++	test_must_fail git branch --unset-upstream a b c
++'
++
++test_expect_success '--unset-upstream should fail on detached HEAD' '
++	git checkout HEAD^{} &&
++	test_must_fail git branch --unset-upstream &&
++	git checkout -
++'
++
+ test_expect_success 'test --unset-upstream on a particular branch' '
+ 	git branch my15
+ 	git branch --set-upstream-to master my14 &&
+ 	git branch --unset-upstream my14 &&
+ 	test_must_fail git config branch.my14.remote &&
+ 	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' '
+ 	git update-ref refs/remotes/origin/master HEAD &&
+ 	git branch --set-upstream origin/master 2>actual &&
+ 	test_when_finished git update-ref -d refs/remotes/origin/master &&
+ 	test_when_finished git branch -d origin/master &&
+ 	cat >expected <<EOF &&
  The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
  
  If you wanted to make '"'master'"' track '"'origin/master'"', do this: