{"thread":{"id":"50034","subject":"t5601 breakage at 3cd325f7be (Merge branch 'js/protocol-advertise-multi' into pu, 2018-12-14)","startedAt":"2018-12-14T12:28:21Z","lastAt":"2018-12-14T18:44:53Z","messageCount":2,"participants":["Johannes Schindelin","Ævar Arnfjörð Bjarmason"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"365346","messageId":"nycvar.QRO.7.76.6.1812141318520.43@tvgsbejvaqbjf.bet","threadId":"50034","inReplyTo":null,"subject":"t5601 breakage at 3cd325f7be (Merge branch 'js/protocol-advertise-multi' into pu, 2018-12-14)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-12-14T12:27:55Z","receivedAt":"2018-12-14T12:28:21Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nthis morning Travis sounded quite a few claxons:\nhttps://travis-ci.org/git/git/builds/467839114\n\nIt seems that quite a few tests in t5601-clone.sh fail, the first of which\nreading like this:\n\n-- snip --\nexpecting success: \n\tgit clone myhost:src ssh-clone &&\n\texpect_ssh \"-o SendEnv=GIT_PROTOCOL\" myhost src\n\n++ git clone myhost:src ssh-clone\nCloning into 'ssh-clone'...\n++ expect_ssh '-o SendEnv=GIT_PROTOCOL' myhost src\n++ test_when_finished '\n\t\t(cd \"$TRASH_DIRECTORY\" && rm -f ssh-expect ssh-output.munged && >ssh-output)\n\t'\n++ test 0 = 0\n++ test_cleanup='{ \n\t\t(cd \"$TRASH_DIRECTORY\" && rm -f ssh-expect ssh-output.munged && >ssh-output)\n\t\n\t\t} && (exit \"$eval_ret\"); eval_ret=$?; :'\n++ case \"$#\" in\n++ echo 'ssh: -o SendEnv=GIT_PROTOCOL myhost git-upload-pack '\\''src'\\'''\n++ cd '/Users/vsts/agent/2.144.0/work/1/s/t/trash directory.t5601-clone'\n++ sed 's/ssh: -o SendEnv=GIT_PROTOCOL /ssh: /'\n++ mv ssh-output.munged ssh-output\n++ test_cmp ssh-expect ssh-output\n++ diff -u ssh-expect ssh-output\n--- ssh-expect\t2018-12-14 04:30:28.000000000 +0000\n+++ ssh-output\t2018-12-14 04:30:28.000000000 +0000\n@@ -1 +1 @@\n-ssh: -o SendEnv=GIT_PROTOCOL myhost git-upload-pack 'src'\n+ssh: myhost git-upload-pack 'src'\nerror: last command exited with $?=1\nnot ok 37 - clone myhost:src uses ssh\n#\t\n#\t\tgit clone myhost:src ssh-clone &&\n#\t\texpect_ssh \"-o SendEnv=GIT_PROTOCOL\" myhost src\n#\t\n-- snap --\n\nI've bisected this down to 3cd325f7be (Merge branch\n'js/protocol-advertise-multi' into pu, 2018-12-14), a merge, meaning that\ntwo topic branches do not play nice with one another.\n\nStaring at the breakage and the changes involved, I suspected that\n391985d7c7 (tests: mark & fix tests broken under\nGIT_TEST_PROTOCOL_VERSION=1, 2018-12-13) does not play well with the\nmerged 24c10f7473 (protocol: advertise multiple supported versions,\n2018-11-16), and indeed, reverting 391985d7c7 on top of 3cd325f7be lets\nt5601 pass again.\n\nIt would appear to me, then, that these two patches step on each others'\ntoes. Josh, Ævar, what should be done about this?\n\nCiao,\nJohannes"},{"id":"365363","messageId":"87k1kc0wyn.fsf@evledraar.gmail.com","threadId":"50034","inReplyTo":"nycvar.QRO.7.76.6.1812141318520.43@tvgsbejvaqbjf.bet","subject":"Re: t5601 breakage at 3cd325f7be (Merge branch 'js/protocol-advertise-multi' into pu, 2018-12-14)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2018-12-14T18:44:48Z","receivedAt":"2018-12-14T18:44:53Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Fri, Dec 14 2018, Johannes Schindelin wrote:\n\n> Hi,\n>\n> this morning Travis sounded quite a few claxons:\n> https://travis-ci.org/git/git/builds/467839114\n>\n> It seems that quite a few tests in t5601-clone.sh fail, the first of which\n> reading like this:\n>\n> -- snip --\n> expecting success:\n> \tgit clone myhost:src ssh-clone &&\n> \texpect_ssh \"-o SendEnv=GIT_PROTOCOL\" myhost src\n>\n> ++ git clone myhost:src ssh-clone\n> Cloning into 'ssh-clone'...\n> ++ expect_ssh '-o SendEnv=GIT_PROTOCOL' myhost src\n> ++ test_when_finished '\n> \t\t(cd \"$TRASH_DIRECTORY\" && rm -f ssh-expect ssh-output.munged && >ssh-output)\n> \t'\n> ++ test 0 = 0\n> ++ test_cleanup='{\n> \t\t(cd \"$TRASH_DIRECTORY\" && rm -f ssh-expect ssh-output.munged && >ssh-output)\n>\n> \t\t} && (exit \"$eval_ret\"); eval_ret=$?; :'\n> ++ case \"$#\" in\n> ++ echo 'ssh: -o SendEnv=GIT_PROTOCOL myhost git-upload-pack '\\''src'\\'''\n> ++ cd '/Users/vsts/agent/2.144.0/work/1/s/t/trash directory.t5601-clone'\n> ++ sed 's/ssh: -o SendEnv=GIT_PROTOCOL /ssh: /'\n> ++ mv ssh-output.munged ssh-output\n> ++ test_cmp ssh-expect ssh-output\n> ++ diff -u ssh-expect ssh-output\n> --- ssh-expect\t2018-12-14 04:30:28.000000000 +0000\n> +++ ssh-output\t2018-12-14 04:30:28.000000000 +0000\n> @@ -1 +1 @@\n> -ssh: -o SendEnv=GIT_PROTOCOL myhost git-upload-pack 'src'\n> +ssh: myhost git-upload-pack 'src'\n> error: last command exited with $?=1\n> not ok 37 - clone myhost:src uses ssh\n> #\n> #\t\tgit clone myhost:src ssh-clone &&\n> #\t\texpect_ssh \"-o SendEnv=GIT_PROTOCOL\" myhost src\n> #\n> -- snap --\n>\n> I've bisected this down to 3cd325f7be (Merge branch\n> 'js/protocol-advertise-multi' into pu, 2018-12-14), a merge, meaning that\n> two topic branches do not play nice with one another.\n>\n> Staring at the breakage and the changes involved, I suspected that\n> 391985d7c7 (tests: mark & fix tests broken under\n> GIT_TEST_PROTOCOL_VERSION=1, 2018-12-13) does not play well with the\n> merged 24c10f7473 (protocol: advertise multiple supported versions,\n> 2018-11-16), and indeed, reverting 391985d7c7 on top of 3cd325f7be lets\n> t5601 pass again.\n>\n> It would appear to me, then, that these two patches step on each others'\n> toes. Josh, Ævar, what should be done about this?\n\nLooking at the two the breakage is on my side, but I got away with it\nbefore. I'm re-rolling mine for this & other fixes, and will make sure\nthe two play well together. Thanks.\n"}]}