{"thread":{"id":"33238","subject":"[PATCH] t3200 (branch): modernize style","startedAt":"2013-03-20T12:30:12Z","lastAt":"2013-03-20T21:34:48Z","messageCount":5,"participants":["Ramkumar Ramachandra","Eric Sunshine","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"211742","messageId":"1363782612-19260-1-git-send-email-artagnon@gmail.com","threadId":"33238","inReplyTo":null,"subject":"[PATCH] t3200 (branch): modernize style","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-03-20T12:30:12Z","receivedAt":"2013-03-20T12:30:12Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Style is inconsistent throughout the file.  Make the following\nchanges:\n\n1. Indent everything with tabs.\n\n2. Put the opening quote (') for the test in the same line as\n   test_expect_succcess, and the closing quote on a line by itself.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Another random patch. Found it while grep'ping around.  I thought I\n could automate my work, which would have been the case if it was\n consistently inconsistent.  Unfortunately, it wasn't, and I ended up\n doing a lot of manual janitorial work :|\n\n t/t3200-branch.sh | 475 ++++++++++++++++++++++++++++--------------------------\n 1 file changed, 243 insertions(+), 232 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex f3e0e4a..3203b15 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -7,20 +7,18 @@ test_description='git branch assorted tests'\n \n . ./test-lib.sh\n \n-test_expect_success \\\n-    'prepare a trivial repository' \\\n-    'echo Hello > A &&\n-     git update-index --add A &&\n-     git commit -m \"Initial commit.\" &&\n-     echo World >> A &&\n-     git update-index --add A &&\n-     git commit -m \"Second commit.\" &&\n-     HEAD=$(git rev-parse --verify HEAD)'\n-\n-test_expect_success \\\n-    'git branch --help should not have created a bogus branch' '\n-     test_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&\n-     test_path_is_missing .git/refs/heads/--help\n+test_expect_success 'prepare a trivial repository' '\n+\techo Hello > A &&\n+\tgit update-index --add A &&\n+\tgit commit -m \"Initial commit.\" &&\n+\techo World >> A &&\n+\tgit update-index --add A &&\n+\tgit commit -m \"Second commit.\" &&\n+\tHEAD=$(git rev-parse --verify HEAD)'\n+\n+test_expect_success 'git branch --help should not have created a bogus branch' '\n+\ttest_might_fail git branch --help </dev/null >/dev/null 2>/dev/null &&\n+\ttest_path_is_missing .git/refs/heads/--help\n '\n \n test_expect_success 'branch -h in broken repository' '\n@@ -34,63 +32,63 @@ test_expect_success 'branch -h in broken repository' '\n \ttest_i18ngrep \"[Uu]sage\" broken/usage\n '\n \n-test_expect_success \\\n-    'git branch abc should create a branch' \\\n-    'git branch abc && test_path_is_file .git/refs/heads/abc'\n+test_expect_success 'git branch abc should create a branch' '\n+\tgit branch abc && test_path_is_file .git/refs/heads/abc\n+'\n \n-test_expect_success \\\n-    'git branch a/b/c should create a branch' \\\n-    'git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c'\n+test_expect_success 'git branch a/b/c should create a branch' '\n+\tgit branch a/b/c && test_path_is_file .git/refs/heads/a/b/c\n+'\n \n cat >expect <<EOF\n $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000\tbranch: Created from master\n EOF\n-test_expect_success \\\n-    'git branch -l d/e/f should create a branch and a log' \\\n-\t'GIT_COMMITTER_DATE=\"2005-05-26 23:30\" \\\n-     git branch -l d/e/f &&\n-\t test_path_is_file .git/refs/heads/d/e/f &&\n-\t test_path_is_file .git/logs/refs/heads/d/e/f &&\n-\t test_cmp expect .git/logs/refs/heads/d/e/f'\n-\n-test_expect_success \\\n-    'git branch -d d/e/f should delete a branch and a log' \\\n-\t'git branch -d d/e/f &&\n-\t test_path_is_missing .git/refs/heads/d/e/f &&\n-\t test_path_is_missing .git/logs/refs/heads/d/e/f'\n-\n-test_expect_success \\\n-    'git branch j/k should work after branch j has been deleted' \\\n-       'git branch j &&\n-        git branch -d j &&\n-        git branch j/k'\n-\n-test_expect_success \\\n-    'git branch l should work after branch l/m has been deleted' \\\n-       'git branch l/m &&\n-        git branch -d l/m &&\n-        git branch l'\n-\n-test_expect_success \\\n-    'git branch -m dumps usage' \\\n-       'test_expect_code 128 git branch -m 2>err &&\n-\ttest_i18ngrep \"too many branches for a rename operation\" err'\n-\n-test_expect_success \\\n-    'git branch -m m m/m should work' \\\n-       'git branch -l m &&\n-        git branch -m m m/m &&\n-\ttest_path_is_file .git/logs/refs/heads/m/m'\n-\n-test_expect_success \\\n-    'git branch -m n/n n should work' \\\n-       'git branch -l n/n &&\n+test_expect_success 'git branch -l d/e/f should create a branch and a log' '\n+\tGIT_COMMITTER_DATE=\"2005-05-26 23:30\" \\\n+\tgit branch -l d/e/f &&\n+\ttest_path_is_file .git/refs/heads/d/e/f &&\n+\ttest_path_is_file .git/logs/refs/heads/d/e/f &&\n+\ttest_cmp expect .git/logs/refs/heads/d/e/f\n+'\n+\n+test_expect_success 'git branch -d d/e/f should delete a branch and a log' '\n+\tgit branch -d d/e/f &&\n+\ttest_path_is_missing .git/refs/heads/d/e/f &&\n+\ttest_path_is_missing .git/logs/refs/heads/d/e/f\n+'\n+\n+test_expect_success 'git branch j/k should work after branch j has been deleted' '\n+\tgit branch j &&\n+\tgit branch -d j &&\n+\tgit branch j/k\n+'\n+\n+test_expect_success 'git branch l should work after branch l/m has been deleted' '\n+\tgit branch l/m &&\n+\tgit branch -d l/m &&\n+\tgit branch l\n+'\n+\n+test_expect_success 'git branch -m dumps usage' '\n+\ttest_expect_code 128 git branch -m 2>err &&\n+\ttest_i18ngrep \"too many branches for a rename operation\" err\n+'\n+\n+test_expect_success 'git branch -m m m/m should work' '\n+\tgit branch -l m &&\n+\tgit branch -m m m/m &&\n+\ttest_path_is_file .git/logs/refs/heads/m/m\n+'\n+\n+test_expect_success 'git branch -m n/n n should work' '\n+\tgit branch -l n/n &&\n \tgit branch -m n/n n &&\n-\ttest_path_is_file .git/logs/refs/heads/n'\n+\ttest_path_is_file .git/logs/refs/heads/n\n+'\n \n test_expect_success 'git branch -m o/o o should fail when o/p exists' '\n \tgit branch o/o &&\n-        git branch o/p &&\n+\tgit branch o/p &&\n \ttest_must_fail git branch -m o/o o\n '\n \n@@ -248,19 +246,20 @@ mv .git/config-saved .git/config\n \n git config branch.s/s.dummy Hello\n \n-test_expect_success \\\n-    'git branch -m s/s s should work when s/t is deleted' \\\n-       'git branch -l s/s &&\n+test_expect_success 'git branch -m s/s s should work when s/t is deleted' '\n+\tgit branch -l s/s &&\n \ttest_path_is_file .git/logs/refs/heads/s/s &&\n-        git branch -l s/t &&\n+\tgit branch -l s/t &&\n \ttest_path_is_file .git/logs/refs/heads/s/t &&\n-        git branch -d s/t &&\n-        git branch -m s/s s &&\n-\ttest_path_is_file .git/logs/refs/heads/s'\n+\tgit branch -d s/t &&\n+\tgit branch -m s/s s &&\n+\ttest_path_is_file .git/logs/refs/heads/s\n+'\n \n-test_expect_success 'config information was renamed, too' \\\n-\t\"test $(git config branch.s.dummy) = Hello &&\n-\t test_must_fail git config branch.s/s/dummy\"\n+test_expect_success 'config information was renamed, too' '\n+\ttest $(git config branch.s.dummy) = Hello &&\n+\ttest_must_fail git config branch.s/s/dummy\n+'\n \n test_expect_success 'deleting a symref' '\n \tgit branch target &&\n@@ -281,8 +280,7 @@ test_expect_success 'deleting a dangling symref' '\n \ttest_i18ncmp expect actual\n '\n \n-test_expect_success 'renaming a symref is not allowed' \\\n-'\n+test_expect_success 'renaming a symref is not allowed' '\n \tgit symbolic-ref refs/heads/master2 refs/heads/master &&\n \ttest_must_fail git branch -m master2 master3 &&\n \tgit symbolic-ref refs/heads/master2 &&\n@@ -290,146 +288,159 @@ test_expect_success 'renaming a symref is not allowed' \\\n \ttest_path_is_missing .git/refs/heads/master3\n '\n \n-test_expect_success SYMLINKS \\\n-    'git branch -m u v should fail when the reflog for u is a symlink' '\n-     git branch -l u &&\n-     mv .git/logs/refs/heads/u real-u &&\n-     ln -s real-u .git/logs/refs/heads/u &&\n-     test_must_fail git branch -m u v\n-'\n-\n-test_expect_success 'test tracking setup via --track' \\\n-    'git config remote.local.url . &&\n-     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n-     git branch --track my1 local/master &&\n-     test $(git config branch.my1.remote) = local &&\n-     test $(git config branch.my1.merge) = refs/heads/master'\n-\n-test_expect_success 'test tracking setup (non-wildcard, matching)' \\\n-    'git config remote.local.url . &&\n-     git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&\n-     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n-     git branch --track my4 local/master &&\n-     test $(git config branch.my4.remote) = local &&\n-     test $(git config branch.my4.merge) = refs/heads/master'\n-\n-test_expect_success 'test tracking setup (non-wildcard, not matching)' \\\n-    'git config remote.local.url . &&\n-     git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&\n-     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n-     git branch --track my5 local/master &&\n-     ! test \"$(git config branch.my5.remote)\" = local &&\n-     ! test \"$(git config branch.my5.merge)\" = refs/heads/master'\n-\n-test_expect_success 'test tracking setup via config' \\\n-    'git config branch.autosetupmerge true &&\n-     git config remote.local.url . &&\n-     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n-     git branch my3 local/master &&\n-     test $(git config branch.my3.remote) = local &&\n-     test $(git config branch.my3.merge) = refs/heads/master'\n-\n-test_expect_success 'test overriding tracking setup via --no-track' \\\n-    'git config branch.autosetupmerge true &&\n-     git config remote.local.url . &&\n-     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n-     git branch --no-track my2 local/master &&\n-     git config branch.autosetupmerge false &&\n-     ! test \"$(git config branch.my2.remote)\" = local &&\n-     ! test \"$(git config branch.my2.merge)\" = refs/heads/master'\n-\n-test_expect_success 'no tracking without .fetch entries' \\\n-    'git config branch.autosetupmerge true &&\n-     git branch my6 s &&\n-     git config branch.automsetupmerge false &&\n-     test -z \"$(git config branch.my6.remote)\" &&\n-     test -z \"$(git config branch.my6.merge)\"'\n-\n-test_expect_success 'test tracking setup via --track but deeper' \\\n-    'git config remote.local.url . &&\n-     git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-     (git show-ref -q refs/remotes/local/o/o || git fetch local) &&\n-     git branch --track my7 local/o/o &&\n-     test \"$(git config branch.my7.remote)\" = local &&\n-     test \"$(git config branch.my7.merge)\" = refs/heads/o/o'\n-\n-test_expect_success 'test deleting branch deletes branch config' \\\n-    'git branch -d my7 &&\n-     test -z \"$(git config branch.my7.remote)\" &&\n-     test -z \"$(git config branch.my7.merge)\"'\n-\n-test_expect_success 'test deleting branch without config' \\\n-    'git branch my7 s &&\n-     sha1=$(git rev-parse my7 | cut -c 1-7) &&\n-     echo \"Deleted branch my7 (was $sha1).\" >expect &&\n-     git branch -d my7 >actual 2>&1 &&\n-     test_i18ncmp expect actual'\n-\n-test_expect_success 'test --track without .fetch entries' \\\n-    'git branch --track my8 &&\n-     test \"$(git config branch.my8.remote)\" &&\n-     test \"$(git config branch.my8.merge)\"'\n-\n-test_expect_success \\\n-    'branch from non-branch HEAD w/autosetupmerge=always' \\\n-    'git config branch.autosetupmerge always &&\n-     git branch my9 HEAD^ &&\n-     git config branch.autosetupmerge false'\n-\n-test_expect_success \\\n-    'branch from non-branch HEAD w/--track causes failure' \\\n-    'test_must_fail git branch --track my10 HEAD^'\n-\n-test_expect_success \\\n-    'branch from tag w/--track causes failure' \\\n-    'git tag foobar &&\n-     test_must_fail git branch --track my11 foobar'\n-\n-test_expect_success 'use --set-upstream-to modify HEAD' \\\n-    'test_config branch.master.remote foo &&\n-     test_config branch.master.merge foo &&\n-     git branch my12\n-     git branch --set-upstream-to my12 &&\n-     test \"$(git config branch.master.remote)\" = \".\" &&\n-     test \"$(git config branch.master.merge)\" = \"refs/heads/my12\"'\n-\n-test_expect_success 'use --set-upstream-to modify a particular branch' \\\n-    'git branch my13\n-     git branch --set-upstream-to master my13 &&\n-     test \"$(git config branch.my13.remote)\" = \".\" &&\n-     test \"$(git config branch.my13.merge)\" = \"refs/heads/master\"'\n-\n-test_expect_success '--unset-upstream should fail if given a non-existent branch' \\\n-    'test_must_fail git branch --unset-upstream i-dont-exist'\n-\n-test_expect_success 'test --unset-upstream on HEAD' \\\n-    'git branch my14\n-     test_config branch.master.remote foo &&\n-     test_config branch.master.merge foo &&\n-     git branch --set-upstream-to my14 &&\n-     git branch --unset-upstream &&\n-     test_must_fail git config branch.master.remote &&\n-     test_must_fail git config branch.master.merge &&\n-     # fail for a branch without upstream set\n-     test_must_fail git branch --unset-upstream\n-'\n-\n-test_expect_success 'test --unset-upstream on a particular branch' \\\n-    'git branch my15\n-     git branch --set-upstream-to master my14 &&\n-     git branch --unset-upstream my14 &&\n-     test_must_fail git config branch.my14.remote &&\n-     test_must_fail git config branch.my14.merge'\n-\n-test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' \\\n-    'git update-ref refs/remotes/origin/master HEAD &&\n-     git branch --set-upstream origin/master 2>actual &&\n-     test_when_finished git update-ref -d refs/remotes/origin/master &&\n-     test_when_finished git branch -d origin/master &&\n-     cat >expected <<EOF &&\n+test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '\n+\tgit branch -l u &&\n+\tmv .git/logs/refs/heads/u real-u &&\n+\tln -s real-u .git/logs/refs/heads/u &&\n+\ttest_must_fail git branch -m u v\n+'\n+\n+test_expect_success 'test tracking setup via --track' '\n+\tgit config remote.local.url . &&\n+\tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n+\tgit branch --track my1 local/master &&\n+\ttest $(git config branch.my1.remote) = local &&\n+\ttest $(git config branch.my1.merge) = refs/heads/master\n+'\n+\n+test_expect_success 'test tracking setup (non-wildcard, matching)' '\n+\tgit config remote.local.url . &&\n+\tgit config remote.local.fetch refs/heads/master:refs/remotes/local/master &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n+\tgit branch --track my4 local/master &&\n+\ttest $(git config branch.my4.remote) = local &&\n+\ttest $(git config branch.my4.merge) = refs/heads/master\n+'\n+\n+test_expect_success 'test tracking setup (non-wildcard, not matching)' '\n+\tgit config remote.local.url . &&\n+\tgit config remote.local.fetch refs/heads/s:refs/remotes/local/s &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n+\tgit branch --track my5 local/master &&\n+\t! test \"$(git config branch.my5.remote)\" = local &&\n+\t! test \"$(git config branch.my5.merge)\" = refs/heads/master\n+'\n+\n+test_expect_success 'test tracking setup via config' '\n+\tgit config branch.autosetupmerge true &&\n+\tgit config remote.local.url . &&\n+\tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n+\tgit branch my3 local/master &&\n+\ttest $(git config branch.my3.remote) = local &&\n+\ttest $(git config branch.my3.merge) = refs/heads/master\n+'\n+\n+test_expect_success 'test overriding tracking setup via --no-track' '\n+\tgit config branch.autosetupmerge true &&\n+\tgit config remote.local.url . &&\n+\tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n+\tgit branch --no-track my2 local/master &&\n+\tgit config branch.autosetupmerge false &&\n+\t! test \"$(git config branch.my2.remote)\" = local &&\n+\t! test \"$(git config branch.my2.merge)\" = refs/heads/master\n+'\n+\n+test_expect_success 'no tracking without .fetch entries' '\n+\tgit config branch.autosetupmerge true &&\n+\tgit branch my6 s &&\n+\tgit config branch.automsetupmerge false &&\n+\ttest -z \"$(git config branch.my6.remote)\" &&\n+\ttest -z \"$(git config branch.my6.merge)\"\n+'\n+\n+test_expect_success 'test tracking setup via --track but deeper' '\n+\tgit config remote.local.url . &&\n+\tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n+\t(git show-ref -q refs/remotes/local/o/o || git fetch local) &&\n+\tgit branch --track my7 local/o/o &&\n+\ttest \"$(git config branch.my7.remote)\" = local &&\n+\ttest \"$(git config branch.my7.merge)\" = refs/heads/o/o\n+'\n+\n+test_expect_success 'test deleting branch deletes branch config' '\n+\tgit branch -d my7 &&\n+\ttest -z \"$(git config branch.my7.remote)\" &&\n+\ttest -z \"$(git config branch.my7.merge)\"\n+'\n+\n+test_expect_success 'test deleting branch without config' '\n+\tgit branch my7 s &&\n+\tsha1=$(git rev-parse my7 | cut -c 1-7) &&\n+\techo \"Deleted branch my7 (was $sha1).\" >expect &&\n+\tgit branch -d my7 >actual 2>&1 &&\n+\ttest_i18ncmp expect actual\n+'\n+\n+test_expect_success 'test --track without .fetch entries' '\n+\tgit branch --track my8 &&\n+\ttest \"$(git config branch.my8.remote)\" &&\n+\ttest \"$(git config branch.my8.merge)\"\n+'\n+\n+test_expect_success 'branch from non-branch HEAD w/autosetupmerge=always' '\n+\tgit config branch.autosetupmerge always &&\n+\tgit branch my9 HEAD^ &&\n+\tgit config branch.autosetupmerge false\n+'\n+\n+test_expect_success 'branch from non-branch HEAD w/--track causes failure' '\n+\ttest_must_fail git branch --track my10 HEAD^\n+'\n+\n+test_expect_success 'branch from tag w/--track causes failure' '\n+\tgit tag foobar &&\n+\ttest_must_fail git branch --track my11 foobar\n+'\n+\n+test_expect_success 'use --set-upstream-to modify HEAD' '\n+\ttest_config branch.master.remote foo &&\n+\ttest_config branch.master.merge foo &&\n+\tgit branch my12\n+\tgit branch --set-upstream-to my12 &&\n+\ttest \"$(git config branch.master.remote)\" = \".\" &&\n+\ttest \"$(git config branch.master.merge)\" = \"refs/heads/my12\"\n+'\n+\n+test_expect_success 'use --set-upstream-to modify a particular branch' '\n+\tgit branch my13\n+\tgit branch --set-upstream-to master my13 &&\n+\ttest \"$(git config branch.my13.remote)\" = \".\" &&\n+\ttest \"$(git config branch.my13.merge)\" = \"refs/heads/master\"\n+'\n+\n+test_expect_success '--unset-upstream should fail if given a non-existent branch' '\n+\ttest_must_fail git branch --unset-upstream i-dont-exist\n+'\n+\n+test_expect_success 'test --unset-upstream on HEAD' '\n+\tgit branch my14\n+\ttest_config branch.master.remote foo &&\n+\ttest_config branch.master.merge foo &&\n+\tgit branch --set-upstream-to my14 &&\n+\tgit branch --unset-upstream &&\n+\ttest_must_fail git config branch.master.remote &&\n+\ttest_must_fail git config branch.master.merge &&\n+\t# fail for a branch without upstream set\n+\ttest_must_fail git branch --unset-upstream\n+'\n+\n+test_expect_success 'test --unset-upstream on a particular branch' '\n+\tgit branch my15\n+\tgit branch --set-upstream-to master my14 &&\n+\tgit branch --unset-upstream my14 &&\n+\ttest_must_fail git config branch.my14.remote &&\n+\ttest_must_fail git config branch.my14.merge\n+'\n+\n+test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' '\n+\tgit update-ref refs/remotes/origin/master HEAD &&\n+\tgit branch --set-upstream origin/master 2>actual &&\n+\ttest_when_finished git update-ref -d refs/remotes/origin/master &&\n+\ttest_when_finished git branch -d origin/master &&\n+\tcat >expected <<EOF &&\n The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n \n If you wanted to make '\"'master'\"' track '\"'origin/master'\"', do this:\n@@ -437,38 +448,38 @@ If you wanted to make '\"'master'\"' track '\"'origin/master'\"', do this:\n     git branch -d origin/master\n     git branch --set-upstream-to origin/master\n EOF\n-     test_cmp expected actual\n+\ttest_cmp expected actual\n '\n \n-test_expect_success '--set-upstream with two args only shows the deprecation message' \\\n-    'git branch --set-upstream master my13 2>actual &&\n-     test_when_finished git branch --unset-upstream master &&\n-     cat >expected <<EOF &&\n+test_expect_success '--set-upstream with two args only shows the deprecation message' '\n+\tgit branch --set-upstream master my13 2>actual &&\n+\ttest_when_finished git branch --unset-upstream master &&\n+\tcat >expected <<EOF &&\n The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n EOF\n-     test_cmp expected actual\n+\ttest_cmp expected actual\n '\n \n-test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' \\\n-    'git branch --set-upstream my13 2>actual &&\n-     test_when_finished git branch --unset-upstream my13 &&\n-     cat >expected <<EOF &&\n+test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '\n+\tgit branch --set-upstream my13 2>actual &&\n+\ttest_when_finished git branch --unset-upstream my13 &&\n+\tcat >expected <<EOF &&\n The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n EOF\n-     test_cmp expected actual\n+\ttest_cmp expected actual\n '\n \n # Keep this test last, as it changes the current branch\n cat >expect <<EOF\n $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000\tbranch: Created from master\n EOF\n-test_expect_success \\\n-    'git checkout -b g/h/i -l should create a branch and a log' \\\n-\t'GIT_COMMITTER_DATE=\"2005-05-26 23:30\" \\\n-     git checkout -b g/h/i -l master &&\n-\t test_path_is_file .git/refs/heads/g/h/i &&\n-\t test_path_is_file .git/logs/refs/heads/g/h/i &&\n-\t test_cmp expect .git/logs/refs/heads/g/h/i'\n+test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' '\n+\tGIT_COMMITTER_DATE=\"2005-05-26 23:30\" \\\n+\tgit checkout -b g/h/i -l master &&\n+\ttest_path_is_file .git/refs/heads/g/h/i &&\n+\ttest_path_is_file .git/logs/refs/heads/g/h/i &&\n+\ttest_cmp expect .git/logs/refs/heads/g/h/i\n+'\n \n test_expect_success 'checkout -b makes reflog by default' '\n \tgit checkout master &&\n-- \n1.8.2\n"},{"id":"211814","messageId":"CAPig+cSAzCM893kunUO=FM5Qh0-+5YON1KfbG4rUiDjZ8CvV4w@mail.gmail.com","threadId":"33238","inReplyTo":"1363782612-19260-1-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH] t3200 (branch): modernize style","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2013-03-20T19:50:43Z","receivedAt":"2013-03-20T19:50:43Z","isPatch":true,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Wed, Mar 20, 2013 at 8:30 AM, Ramkumar Ramachandra\n<artagnon@gmail.com> wrote:\n> Style is inconsistent throughout the file.  Make the following\n> changes:\n>\n> 1. Indent everything with tabs.\n>\n> 2. Put the opening quote (') for the test in the same line as\n>    test_expect_succcess, and the closing quote on a line by itself.\n\ns/succcess/success/\n"},{"id":"211817","messageId":"CALkWK0nNjvtomirbQ5D5CqL3c2gRwmp5KcDfbGz6DrF7tkwspw@mail.gmail.com","threadId":"33238","inReplyTo":"CAPig+cSAzCM893kunUO=FM5Qh0-+5YON1KfbG4rUiDjZ8CvV4w@mail.gmail.com","subject":"Re: [PATCH] t3200 (branch): modernize style","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-03-20T19:57:35Z","receivedAt":"2013-03-20T19:57:35Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Eric Sunshine wrote:\n> On Wed, Mar 20, 2013 at 8:30 AM, Ramkumar Ramachandra\n> <artagnon@gmail.com> wrote:\n>> Style is inconsistent throughout the file.  Make the following\n>> changes:\n>>\n>> 1. Indent everything with tabs.\n>>\n>> 2. Put the opening quote (') for the test in the same line as\n>>    test_expect_succcess, and the closing quote on a line by itself.\n>\n> s/succcess/success/\n\nThanks, much appreciated.  I really need to set up some Flyspell hooks.\n"},{"id":"211824","messageId":"7vwqt1dcp1.fsf@alter.siamese.dyndns.org","threadId":"33238","inReplyTo":"1363782612-19260-1-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH] t3200 (branch): modernize style","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-03-20T20:43:38Z","receivedAt":"2013-03-20T20:43:38Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n>  Another random patch. Found it while grep'ping around.  I thought I\n>  could automate my work, which would have been the case if it was\n>  consistently inconsistent.  Unfortunately, it wasn't, and I ended up\n>  doing a lot of manual janitorial work :|\n\nThanks.  It would have been nicer to also fix the redirection,\ne.g. \"cmd >target\" (not \"cmd > target\") that appear in the first\nhunk, i.e. this on top (I'll squash this in myself).\n\n t/t3200-branch.sh | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 3203b15..74fbba1 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -8,10 +8,10 @@ test_description='git branch assorted tests'\n . ./test-lib.sh\n \n test_expect_success 'prepare a trivial repository' '\n-\techo Hello > A &&\n+\techo Hello >A &&\n \tgit update-index --add A &&\n \tgit commit -m \"Initial commit.\" &&\n-\techo World >> A &&\n+\techo World >>A &&\n \tgit update-index --add A &&\n \tgit commit -m \"Second commit.\" &&\n \tHEAD=$(git rev-parse --verify HEAD)'\n@@ -750,7 +750,7 @@ test_expect_success 'detect misconfigured autosetuprebase (bad value)' '\n \n test_expect_success 'detect misconfigured autosetuprebase (no value)' '\n \tgit config --unset branch.autosetuprebase &&\n-\techo \"[branch] autosetuprebase\" >> .git/config &&\n+\techo \"[branch] autosetuprebase\" >>.git/config &&\n \ttest_must_fail git branch &&\n \tgit config --unset branch.autosetuprebase\n '\n"},{"id":"211829","messageId":"7vhak5dabr.fsf@alter.siamese.dyndns.org","threadId":"33238","inReplyTo":"7vwqt1dcp1.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH] t3200 (branch): modernize style","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-03-20T21:34:48Z","receivedAt":"2013-03-20T21:34:48Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Ramkumar Ramachandra <artagnon@gmail.com> writes:\n>\n>>  Another random patch. Found it while grep'ping around.  I thought I\n>>  could automate my work, which would have been the case if it was\n>>  consistently inconsistent.  Unfortunately, it wasn't, and I ended up\n>>  doing a lot of manual janitorial work :|\n>\n> Thanks.  It would have been nicer to also fix the redirection,\n> e.g. \"cmd >target\" (not \"cmd > target\") that appear in the first\n> hunk, i.e. this on top (I'll squash this in myself).\n\nBy the way, please pick a time when a file is quiescent, next time\nwhen your grep urges you to do a file-wide clean-up.  I _think_ I\ngot the conflicts with an in-flight topic resolved correctly, but I\nmay have made trivial and stupid mistakes while doing so.\n\nThanks.\n"}]}