{"thread":{"id":"41098","subject":"./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?","startedAt":"2015-12-30T13:20:04Z","lastAt":"2015-12-31T15:47:23Z","messageCount":4,"participants":["Torsten Bögershausen","Eric Sunshine","Ramsay Jones"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"275183","messageId":"5683DA04.6000007@web.de","threadId":"41098","inReplyTo":null,"subject":"./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2015-12-30T13:20:04Z","receivedAt":"2015-12-30T13:20:04Z","isPatch":false,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"I got 2 failures on pu under Mac OS, (Linux is OK)\nI did some very basic debugging, it seems as if grep doesn't find\na needed string.\nDoes anybody have an idea here ?\n\n\n--------------------\nFailure 1:\nAdd some debug code:\ngit diff\n\n-       grep -q refs/notes/z merge_commit_msg &&\n+       echo >&2 before grep &&\n+       echo >&2 before cat &&\n+       cat >&2 merge_commit_msg &&\n+       echo >&2 after cat &&\n+       grep  refs/notes/z merge_commit_msg >&2 &&\n        # Merge commit mentions conflicting notes\n+       echo >&2 after grep &&\n\n------ run the test:\ndebug=t verbose=t   ./t3310-notes-merge-manual-resolve.sh 2>&1 | less\n-------- get this output:\nbefore grep\nbefore cat\nMerged notes from z into refs/notes/m\n\nConflicts:\n        04ed9a0bbe0285f41c913e2002cb09ef8449d4a6\n        0f7aa3ec6325aeb88b910453bb3eb37c49d75c11\n        7a4ca6ee52a974a66cbaa78e33214535dff1d691\n        d07d62e5208f22eb5695e7eb47667dc8b9860290\n\nafter cat\nnot ok 13 - finalize conflicting merge (z => m)\n\n\n-----------------------\nFailure 2:\nindex d557212..92fabf0 100755\n--- a/t/t3310-notes-merge-manual-resolve.sh\n+++ b/t/t3310-notes-merge-manual-resolve.sh\n@@ -472,6 +472,9 @@ EOF\n        test \"$(git rev-parse refs/notes/m^2)\" = \"$(cat pre_merge_z)\" &&\n        # Merge commit mentions the notes refs merged\n        git log -1 --format=%B refs/notes/m > merge_commit_msg &&\n+       echo >&2 before cat &&\n+       cat merge_commit_msg >&2 &&\n+       echo >&2 after cat &&\n\nnot ok 17 - add + remove notes in finalized merge (z => m)\n---------- gives this:\nbefore cat\nMerged notes from z into refs/notes/m\n\nConflicts:\n        04ed9a0bbe0285f41c913e2002cb09ef8449d4a6\n        0f7aa3ec6325aeb88b910453bb3eb37c49d75c11\n        7a4ca6ee52a974a66cbaa78e33214535dff1d691\n        d07d62e5208f22eb5695e7eb47667dc8b9860290\n\nafter cat\n"},{"id":"275229","messageId":"CAPig+cQZq-aDYv5G3eNivvqC0eCTfyPtA4gEuop0PWq2LFT=9Q@mail.gmail.com","threadId":"41098","inReplyTo":"5683DA04.6000007@web.de","subject":"Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?","fromName":"Eric Sunshine","fromEmail":"sunshine@sunshineco.com","sentAt":"2015-12-31T06:08:05Z","receivedAt":"2015-12-31T06:08:05Z","isPatch":false,"sender":{"key":"sunshine@sunshineco.com","avatar":"https://avatars.githubusercontent.com/u/163641?v=4"},"body":"On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen <tboegi@web.de> wrote:\n> I got 2 failures on pu under Mac OS, (Linux is OK)\n> I did some very basic debugging, it seems as if grep doesn't find\n> a needed string.\n> Does anybody have an idea here ?\n\nI'm unable to reproduce these failures on Mac.\n\n> --------------------\n> Failure 1:\n> Add some debug code:\n> git diff\n>\n> -       grep -q refs/notes/z merge_commit_msg &&\n> +       echo >&2 before grep &&\n> +       echo >&2 before cat &&\n> +       cat >&2 merge_commit_msg &&\n> +       echo >&2 after cat &&\n> +       grep  refs/notes/z merge_commit_msg >&2 &&\n>         # Merge commit mentions conflicting notes\n> +       echo >&2 after grep &&\n>\n> ------ run the test:\n> debug=t verbose=t   ./t3310-notes-merge-manual-resolve.sh 2>&1 | less\n> -------- get this output:\n> before grep\n> before cat\n> Merged notes from z into refs/notes/m\n>\n> Conflicts:\n>         04ed9a0bbe0285f41c913e2002cb09ef8449d4a6\n>         0f7aa3ec6325aeb88b910453bb3eb37c49d75c11\n>         7a4ca6ee52a974a66cbaa78e33214535dff1d691\n>         d07d62e5208f22eb5695e7eb47667dc8b9860290\n>\n> after cat\n> not ok 13 - finalize conflicting merge (z => m)\n>\n>\n> -----------------------\n> Failure 2:\n> index d557212..92fabf0 100755\n> --- a/t/t3310-notes-merge-manual-resolve.sh\n> +++ b/t/t3310-notes-merge-manual-resolve.sh\n> @@ -472,6 +472,9 @@ EOF\n>         test \"$(git rev-parse refs/notes/m^2)\" = \"$(cat pre_merge_z)\" &&\n>         # Merge commit mentions the notes refs merged\n>         git log -1 --format=%B refs/notes/m > merge_commit_msg &&\n> +       echo >&2 before cat &&\n> +       cat merge_commit_msg >&2 &&\n> +       echo >&2 after cat &&\n>\n> not ok 17 - add + remove notes in finalized merge (z => m)\n> ---------- gives this:\n> before cat\n> Merged notes from z into refs/notes/m\n>\n> Conflicts:\n>         04ed9a0bbe0285f41c913e2002cb09ef8449d4a6\n>         0f7aa3ec6325aeb88b910453bb3eb37c49d75c11\n>         7a4ca6ee52a974a66cbaa78e33214535dff1d691\n>         d07d62e5208f22eb5695e7eb47667dc8b9860290\n>\n> after cat\n"},{"id":"275235","messageId":"56851E2E.4050403@ramsayjones.plus.com","threadId":"41098","inReplyTo":"CAPig+cQZq-aDYv5G3eNivvqC0eCTfyPtA4gEuop0PWq2LFT=9Q@mail.gmail.com","subject":"Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ?","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2015-12-31T12:23:10Z","receivedAt":"2015-12-31T12:23:10Z","isPatch":false,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\n\nOn 31/12/15 06:08, Eric Sunshine wrote:\n> On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen <tboegi@web.de> wrote:\n>> I got 2 failures on pu under Mac OS, (Linux is OK)\n>> I did some very basic debugging, it seems as if grep doesn't find\n>> a needed string.\n>> Does anybody have an idea here ?\n> \n> I'm unable to reproduce these failures on Mac.\n> \n\nThis test failed during a short window (due to commit 2bd811ec) and\nhas already been fixed in commit 3a74ea38 (\"notes: allow merging\nfrom arbitrary references\", 29-12-2015).\n\nATB,\nRamsay Jones\n"},{"id":"275247","messageId":"56854E0B.9010205@web.de","threadId":"41098","inReplyTo":"56851E2E.4050403@ramsayjones.plus.com","subject":"Re: ./t3310 fixed, t3400 broken","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2015-12-31T15:47:23Z","receivedAt":"2015-12-31T15:47:23Z","isPatch":false,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"> t3310-notes-merge-manual-resolve.sh\n>failed during a short window (due to commit 2bd811ec) and\n> has already been fixed in commit 3a74ea38 (\"notes: allow merging\n> from arbitrary references\", 29-12-2015).\n\nYes, it's fixed. Sorry for the noise.\n\n\nThe next failure is t3400.\nIs there a chance to squeeze in this diff ?\n\n--- a/t/t3400-rebase.sh\n+++ b/t/t3400-rebase.sh\n@@ -259,11 +259,11 @@ test_expect_success 'rebase duplicated commit with\n--keep-empty' '\n        git reset --hard &&\n        git checkout master &&\n\n-       >x && git add x && git commit x -mx &&\n-       echo x >x && git commit x -mx1 &&\n+       >y && git add y && git commit y -my &&\n+       echo y >y && git commit y -my1 &&\n\n        git checkout -b duplicated HEAD~ &&\n-       echo x >x && git commit x -mx2 &&\n+       echo y >y && git commit y -my2 &&\n        git rebase --keep-empty master\n '\n\n\n\n\n\n\n\n\n> \n> ATB,\n> Ramsay Jones\n> \n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n> \n"}]}