{"thread":{"id":"7846","subject":"[PATCH] Convert t6022 to use git-merge instead of git-pull","startedAt":"2007-04-25T20:07:18Z","lastAt":"2007-04-29T07:17:46Z","messageCount":5,"participants":["Alex Riesen","Junio C Hamano","Andy Whitcroft"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"40436","messageId":"20070425200718.GB30061@steel.home","threadId":"7846","inReplyTo":null,"subject":"[PATCH] Convert t6022 to use git-merge instead of git-pull","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-04-25T20:07:18Z","receivedAt":"2007-04-25T20:07:18Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Signed-off-by: Alex Riesen <raa.lkml@gmail.com>\n---\n t/t6022-merge-rename.sh |   28 ++++++++++++++--------------\n 1 files changed, 14 insertions(+), 14 deletions(-)\n\ndiff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh\nindex b608e20..99817de 100755\n--- a/t/t6022-merge-rename.sh\n+++ b/t/t6022-merge-rename.sh\n@@ -79,10 +79,10 @@ git commit -m \"blue renames A->C, M->N\" &&\n \n git checkout master'\n \n-test_expect_success 'pull renaming branch into unrenaming one' \\\n+test_expect_success 'merge renaming branch into unrenaming one' \\\n '\n \tgit show-branch\n-\tgit pull . white && {\n+\tgit merge white && {\n \t\techo \"BAD: should have conflicted\"\n \t\treturn 1\n \t}\n@@ -108,12 +108,12 @@ test_expect_success 'pull renaming branch into unrenaming one' \\\n \t}\n '\n \n-test_expect_success 'pull renaming branch into another renaming one' \\\n+test_expect_success 'merge renaming branch into another renaming one' \\\n '\n \trm -f B\n \tgit reset --hard\n \tgit checkout red\n-\tgit pull . white && {\n+\tgit merge white && {\n \t\techo \"BAD: should have conflicted\"\n \t\treturn 1\n \t}\n@@ -138,11 +138,11 @@ test_expect_success 'pull renaming branch into another renaming one' \\\n \t}\n '\n \n-test_expect_success 'pull unrenaming branch into renaming one' \\\n+test_expect_success 'merge unrenaming branch into renaming one' \\\n '\n \tgit reset --hard\n \tgit show-branch\n-\tgit pull . master && {\n+\tgit merge master && {\n \t\techo \"BAD: should have conflicted\"\n \t\treturn 1\n \t}\n@@ -167,11 +167,11 @@ test_expect_success 'pull unrenaming branch into renaming one' \\\n \t}\n '\n \n-test_expect_success 'pull conflicting renames' \\\n+test_expect_success 'merge conflicting renames' \\\n '\n \tgit reset --hard\n \tgit show-branch\n-\tgit pull . blue && {\n+\tgit merge blue && {\n \t\techo \"BAD: should have conflicted\"\n \t\treturn 1\n \t}\n@@ -209,7 +209,7 @@ test_expect_success 'interference with untracked working tree file' '\n \tgit reset --hard\n \tgit show-branch\n \techo >A this file should not matter\n-\tgit pull . white && {\n+\tgit merge white && {\n \t\techo \"BAD: should have conflicted\"\n \t\treturn 1\n \t}\n@@ -226,7 +226,7 @@ test_expect_success 'interference with untracked working tree file' '\n \tgit show-branch\n \trm -f A\n \techo >A this file should not matter\n-\tgit pull . red && {\n+\tgit merge red && {\n \t\techo \"BAD: should have conflicted\"\n \t\treturn 1\n \t}\n@@ -243,7 +243,7 @@ test_expect_success 'interference with untracked working tree file' '\n \tgit checkout -f master\n \tgit tag -f anchor\n \tgit show-branch\n-\tgit pull . yellow || {\n+\tgit merge yellow || {\n \t\techo \"BAD: should have cleanly merged\"\n \t\treturn 1\n \t}\n@@ -263,7 +263,7 @@ test_expect_success 'updated working tree file should prevent the merge' '\n \tgit show-branch\n \techo >>M one line addition\n \tcat M >M.saved\n-\tgit pull . yellow && {\n+\tgit merge yellow && {\n \t\techo \"BAD: should have complained\"\n \t\treturn 1\n \t}\n@@ -284,7 +284,7 @@ test_expect_success 'updated working tree file should prevent the merge' '\n \techo >>M one line addition\n \tcat M >M.saved\n \tgit update-index M\n-\tgit pull . yellow && {\n+\tgit merge yellow && {\n \t\techo \"BAD: should have complained\"\n \t\treturn 1\n \t}\n@@ -303,7 +303,7 @@ test_expect_success 'interference with untracked working tree file' '\n \tgit tag -f anchor\n \tgit show-branch\n \techo >M this file should not matter\n-\tgit pull . master || {\n+\tgit merge master || {\n \t\techo \"BAD: should have cleanly merged\"\n \t\treturn 1\n \t}\n-- \n1.5.2.rc0.63.gdfc8-dirty\n"},{"id":"40457","messageId":"7vzm4wupew.fsf@assigned-by-dhcp.cox.net","threadId":"7846","inReplyTo":"20070425200718.GB30061@steel.home","subject":"Re: [PATCH] Convert t6022 to use git-merge instead of git-pull","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-25T21:15:03Z","receivedAt":"2007-04-25T21:15:03Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Is this really necessary?\n\nI would rather want to leave some tests use \"git merge\" while\nsome others use \"git pull .\" to catch breakage of either form.\n"},{"id":"40462","messageId":"20070425221204.GG30061@steel.home","threadId":"7846","inReplyTo":"7vzm4wupew.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Convert t6022 to use git-merge instead of git-pull","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-04-25T22:12:04Z","receivedAt":"2007-04-25T22:12:04Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"Junio C Hamano, Wed, Apr 25, 2007 23:15:03 +0200:\n> Is this really necessary?\n> \n> I would rather want to leave some tests use \"git merge\" while\n> some others use \"git pull .\" to catch breakage of either form.\n> \n\nNo, of course not. I think the last patch should apply anyway.\nI didn't realize these were the last uses of the old git-pull\nsyntax\n"},{"id":"40652","messageId":"46332BFF.2050805@shadowen.org","threadId":"7846","inReplyTo":"7vzm4wupew.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] Convert t6022 to use git-merge instead of git-pull","fromName":"Andy Whitcroft","fromEmail":"apw@shadowen.org","sentAt":"2007-04-28T11:11:59Z","receivedAt":"2007-04-28T11:11:59Z","isPatch":true,"sender":{"key":"apw@shadowen.org","avatar":"https://gravatar.com/avatar/d3088262854661a913ef35cc40fedcc270142d4461791142bc1ea0b2a4e2e147?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> Is this really necessary?\n> \n> I would rather want to leave some tests use \"git merge\" while\n> some others use \"git pull .\" to catch breakage of either form.\n\nIf we are saying git pull . foo and git merge foo forms are the same\nthen perhaps that whole bunch of tests should be converted such that\nthey are in for cmd in \"merge\" \"pull .\" loop, so we test both always.\n\n-apw\n"},{"id":"40699","messageId":"7vps5nejj9.fsf@assigned-by-dhcp.cox.net","threadId":"7846","inReplyTo":"46332BFF.2050805@shadowen.org","subject":"Re: [PATCH] Convert t6022 to use git-merge instead of git-pull","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-04-29T07:17:46Z","receivedAt":"2007-04-29T07:17:46Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Andy Whitcroft <apw@shadowen.org> writes:\n\n> Junio C Hamano wrote:\n>> Is this really necessary?\n>> \n>> I would rather want to leave some tests use \"git merge\" while\n>> some others use \"git pull .\" to catch breakage of either form.\n>\n> If we are saying git pull . foo and git merge foo forms are the same\n> then perhaps that whole bunch of tests should be converted such that\n> they are in for cmd in \"merge\" \"pull .\" loop, so we test both always.\n\nNot \"whole bunch\" needs to check they are the same.  Ideally we\nwould want to have a single separate test whose sole purpose is\nto make sure they are the same, but if we do not have such a\ntest, the next best thing is to leave some test to use one way\nwhile some others to use another.  In other words, consistency\nis not necessarily better than diversity in tests.\n"}]}