# ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ? 4 messages from 2015-12-30 to 2015-12-31. Participants: Torsten Bögershausen, Eric Sunshine, Ramsay Jones. Thread: https://gitlist.dev/t/41098 ## Torsten Bögershausen, 2015-12-30 13:20 Subject: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ? Message-ID: <5683DA04.6000007@web.de> URL: https://gitlist.dev/e/5683DA04.6000007%40web.de ``` I got 2 failures on pu under Mac OS, (Linux is OK) I did some very basic debugging, it seems as if grep doesn't find a needed string. Does anybody have an idea here ? -------------------- Failure 1: Add some debug code: git diff - grep -q refs/notes/z merge_commit_msg && + echo >&2 before grep && + echo >&2 before cat && + cat >&2 merge_commit_msg && + echo >&2 after cat && + grep refs/notes/z merge_commit_msg >&2 && # Merge commit mentions conflicting notes + echo >&2 after grep && ------ run the test: debug=t verbose=t ./t3310-notes-merge-manual-resolve.sh 2>&1 | less -------- get this output: before grep before cat Merged notes from z into refs/notes/m Conflicts: 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 7a4ca6ee52a974a66cbaa78e33214535dff1d691 d07d62e5208f22eb5695e7eb47667dc8b9860290 after cat not ok 13 - finalize conflicting merge (z => m) ----------------------- Failure 2: index d557212..92fabf0 100755 --- a/t/t3310-notes-merge-manual-resolve.sh +++ b/t/t3310-notes-merge-manual-resolve.sh @@ -472,6 +472,9 @@ EOF test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" && # Merge commit mentions the notes refs merged git log -1 --format=%B refs/notes/m > merge_commit_msg && + echo >&2 before cat && + cat merge_commit_msg >&2 && + echo >&2 after cat && not ok 17 - add + remove notes in finalized merge (z => m) ---------- gives this: before cat Merged notes from z into refs/notes/m Conflicts: 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 7a4ca6ee52a974a66cbaa78e33214535dff1d691 d07d62e5208f22eb5695e7eb47667dc8b9860290 after cat ``` ## Eric Sunshine, 2015-12-31 06:08 Subject: Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ? Message-ID: URL: https://gitlist.dev/e/CAPig%2BcQZq-aDYv5G3eNivvqC0eCTfyPtA4gEuop0PWq2LFT%3D9Q%40mail.gmail.com In-Reply-To: <5683DA04.6000007@web.de> ``` On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen wrote: > I got 2 failures on pu under Mac OS, (Linux is OK) > I did some very basic debugging, it seems as if grep doesn't find > a needed string. > Does anybody have an idea here ? I'm unable to reproduce these failures on Mac. > -------------------- > Failure 1: > Add some debug code: > git diff > > - grep -q refs/notes/z merge_commit_msg && > + echo >&2 before grep && > + echo >&2 before cat && > + cat >&2 merge_commit_msg && > + echo >&2 after cat && > + grep refs/notes/z merge_commit_msg >&2 && > # Merge commit mentions conflicting notes > + echo >&2 after grep && > > ------ run the test: > debug=t verbose=t ./t3310-notes-merge-manual-resolve.sh 2>&1 | less > -------- get this output: > before grep > before cat > Merged notes from z into refs/notes/m > > Conflicts: > 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6 > 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 > 7a4ca6ee52a974a66cbaa78e33214535dff1d691 > d07d62e5208f22eb5695e7eb47667dc8b9860290 > > after cat > not ok 13 - finalize conflicting merge (z => m) > > > ----------------------- > Failure 2: > index d557212..92fabf0 100755 > --- a/t/t3310-notes-merge-manual-resolve.sh > +++ b/t/t3310-notes-merge-manual-resolve.sh > @@ -472,6 +472,9 @@ EOF > test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" && > # Merge commit mentions the notes refs merged > git log -1 --format=%B refs/notes/m > merge_commit_msg && > + echo >&2 before cat && > + cat merge_commit_msg >&2 && > + echo >&2 after cat && > > not ok 17 - add + remove notes in finalized merge (z => m) > ---------- gives this: > before cat > Merged notes from z into refs/notes/m > > Conflicts: > 04ed9a0bbe0285f41c913e2002cb09ef8449d4a6 > 0f7aa3ec6325aeb88b910453bb3eb37c49d75c11 > 7a4ca6ee52a974a66cbaa78e33214535dff1d691 > d07d62e5208f22eb5695e7eb47667dc8b9860290 > > after cat ``` ## Ramsay Jones, 2015-12-31 12:23 Subject: Re: ./t3310-notes-merge-manual-resolve.sh broken on pu under Mac OS ? Message-ID: <56851E2E.4050403@ramsayjones.plus.com> URL: https://gitlist.dev/e/56851E2E.4050403%40ramsayjones.plus.com In-Reply-To: ``` On 31/12/15 06:08, Eric Sunshine wrote: > On Wed, Dec 30, 2015 at 8:20 AM, Torsten Bögershausen wrote: >> I got 2 failures on pu under Mac OS, (Linux is OK) >> I did some very basic debugging, it seems as if grep doesn't find >> a needed string. >> Does anybody have an idea here ? > > I'm unable to reproduce these failures on Mac. > This test failed during a short window (due to commit 2bd811ec) and has already been fixed in commit 3a74ea38 ("notes: allow merging from arbitrary references", 29-12-2015). ATB, Ramsay Jones ``` ## Torsten Bögershausen, 2015-12-31 15:47 Subject: Re: ./t3310 fixed, t3400 broken Message-ID: <56854E0B.9010205@web.de> URL: https://gitlist.dev/e/56854E0B.9010205%40web.de In-Reply-To: <56851E2E.4050403@ramsayjones.plus.com> ``` > t3310-notes-merge-manual-resolve.sh >failed during a short window (due to commit 2bd811ec) and > has already been fixed in commit 3a74ea38 ("notes: allow merging > from arbitrary references", 29-12-2015). Yes, it's fixed. Sorry for the noise. The next failure is t3400. Is there a chance to squeeze in this diff ? --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -259,11 +259,11 @@ test_expect_success 'rebase duplicated commit with --keep-empty' ' git reset --hard && git checkout master && - >x && git add x && git commit x -mx && - echo x >x && git commit x -mx1 && + >y && git add y && git commit y -my && + echo y >y && git commit y -my1 && git checkout -b duplicated HEAD~ && - echo x >x && git commit x -mx2 && + echo y >y && git commit y -my2 && git rebase --keep-empty master ' > > ATB, > Ramsay Jones > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ```