{"thread":{"id":"12180","subject":"[PATCH] test cases: optionally setup branch.*.merge from upstream local branches","startedAt":"2008-02-18T15:07:25Z","lastAt":"2008-02-18T18:23:12Z","messageCount":2,"participants":["Jay Soffian","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"69159","messageId":"1203347245-23533-1-git-send-email-jaysoffian@gmail.com","threadId":"12180","inReplyTo":null,"subject":"[PATCH] test cases: optionally setup branch.*.merge from upstream local branches","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2008-02-18T15:07:25Z","receivedAt":"2008-02-18T15:07:25Z","isPatch":true,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"Added test cases for new \"optionally setup branch.*.merge from upstream local\nbranches\" functionality.\n\nSigned-off-by: Jay Soffian <jaysoffian@gmail.com>\n---\n t/t3200-branch.sh |   21 +++++++++++++++++++--\n 1 files changed, 19 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex d21081d..8d1dccd 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -161,7 +161,7 @@ test_expect_success 'avoid ambiguous track' '\n '\n \n test_expect_success 'test overriding tracking setup via --no-track' \\\n-    'git config branch.autosetupmerge true &&\n+    'git config branch.autosetupmerge always &&\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@@ -171,7 +171,9 @@ test_expect_success 'test overriding tracking setup via --no-track' \\\n      ! test \"$(git config branch.my2.merge)\" = refs/heads/master'\n \n test_expect_success 'no tracking without .fetch entries' \\\n-    'git branch --track my6 s &&\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@@ -192,6 +194,21 @@ test_expect_success 'test deleting branch without config' \\\n     'git branch my7 s &&\n      test \"$(git branch -d my7 2>&1)\" = \"Deleted branch my7.\"'\n \n+test_expect_success 'test tracking without .fetch entries w/--track given' \\\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+    'test tracking without .fetch entries w/autosetupmerge=always' \\\n+    'git config branch.autosetupmerge always &&\n+     git branch --track my9 &&\n+     git config branch.autosetupmerge false\n+     test \"$(git config branch.my9.remote)\" &&\n+     test \"$(git config branch.my9.merge)\"'\n+\n+\n+\n # Keep this test last, as it changes the current branch\n cat >expect <<EOF\n 0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000\tbranch: Created from master\n-- \n1.5.4.2.203.gf8d86\n"},{"id":"69182","messageId":"alpine.LSU.1.00.0802181822130.30505@racer.site","threadId":"12180","inReplyTo":"1203347245-23533-1-git-send-email-jaysoffian@gmail.com","subject":"Re: [PATCH] test cases: optionally setup branch.*.merge from upstream local branches","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-02-18T18:23:12Z","receivedAt":"2008-02-18T18:23:12Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 18 Feb 2008, Jay Soffian wrote:\n\n> Added test cases for new \"optionally setup branch.*.merge from upstream \n> local branches\" functionality.\n> \n> Signed-off-by: Jay Soffian <jaysoffian@gmail.com>\n> ---\n>  t/t3200-branch.sh |   21 +++++++++++++++++++--\n\nYou might want to add another patch, this time to t7201-co.sh, which \ndemonstrates that even a \"branch.autosetupmerge false\" does not prevent \n\"git checkout --track -b <name>\" from working.\n\nCiao,\nDscho\n"}]}