{"thread":{"id":"24798","subject":"t7610-mergetool.sh -q isn't quiet","startedAt":"2010-08-20T06:50:10Z","lastAt":"2010-08-20T21:03:01Z","messageCount":2,"participants":["Brian Gernhardt","Ævar Arnfjörð Bjarmason"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"148505","messageId":"E395511F-ACF9-4390-A081-4AC4C072C7CC@gernhardtsoftware.com","threadId":"24798","inReplyTo":null,"subject":"t7610-mergetool.sh -q isn't quiet","fromName":"Brian Gernhardt","fromEmail":"brian@gernhardtsoftware.com","sentAt":"2010-08-20T06:50:10Z","receivedAt":"2010-08-20T06:50:10Z","isPatch":false,"sender":{"key":"brian@gernhardtsoftware.com","avatar":"https://avatars.githubusercontent.com/u/133455?v=4"},"body":"I'm just posting this to the list because I should really already be in bed...\n\nRunning t7610-mergetool with -q isn't quiet.  This is also noticeable when running the full test suite in a TAP harness (e.g. prove).\n\n$ ./t7610-mergetool.sh -q\nNormal merge conflict for 'file1':\n  {local}: modified\n  {remote}: modified\nNormal merge conflict for 'file2':\n  {local}: created\n  {remote}: created\nNormal merge conflict for 'subdir/file3':\n  {local}: modified\n  {remote}: modified\n# passed all 7 test(s)\n1..7\n\nAll the output seems to be from the last test.\n\nAlso, some of the test style seems odd.  For example:\n\ntest_expect_success 'mergetool on file in parent dir' '\n    cd subdir && (\n    ( yes \"\" | git mergetool ../file1 >/dev/null 2>&1 ) &&\n    ( yes \"\" | git mergetool ../file2 >/dev/null 2>&1 ) &&\n    test \"$(cat ../file1)\" = \"master updated\" &&\n    test \"$(cat ../file2)\" = \"master new\" &&\n    git commit -m \"branch1 resolved with mergetool - subdir\") &&\n    cd ..\n'\n\nShouldn't that just be :\n\n    (\n     cd subdir &&\n     yadda &&\n     yadda\n    )\n\nIf nobody else gets to it, hopefully I'll find time tomorrow.  If not, I should get a fresh supply of tuits over the weekend.\n\n~~ Brian"},{"id":"148609","messageId":"AANLkTink1HaOWCYsr5+Q+JAi_zA_gEHmOU1J3fvq8jnd@mail.gmail.com","threadId":"24798","inReplyTo":"E395511F-ACF9-4390-A081-4AC4C072C7CC@gernhardtsoftware.com","subject":"Re: t7610-mergetool.sh -q isn't quiet","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-20T21:03:01Z","receivedAt":"2010-08-20T21:03:01Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Fri, Aug 20, 2010 at 06:50, Brian Gernhardt\n<brian@gernhardtsoftware.com> wrote:\n\n>    test \"$(cat ../file1)\" = \"master updated\" &&\n>    test \"$(cat ../file2)\" = \"master new\" &&\n\nThat should also use test_cmp.\n"}]}