{"thread":{"id":"48835","subject":"What's (not) cooking","startedAt":"2018-07-06T22:58:01Z","lastAt":"2018-07-09T16:13:36Z","messageCount":9,"participants":["Junio C Hamano","Elijah Newren","Johannes Schindelin","Kim Gybels","Derrick Stolee"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"351831","messageId":"xmqqlgaogeff.fsf@gitster-ct.c.googlers.com","threadId":"48835","inReplyTo":null,"subject":"What's (not) cooking","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-06T22:57:56Z","receivedAt":"2018-07-06T22:58:01Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I'll be pushing out the integration branches with some updates, but\nthere is no change in 'next' and below. The following topics I gave\na quick look and gave them topic branches, but I had trouble merging\nthem in 'pu' and making them work correctly or pass the tests, so\nthey are not part of 'pu' in today's pushout.\n\n pk/rebase-in-c\n en/dirty-merge-fixes\n en/t6036-merge-recursive-tests\n en/t6042-insane-merge-rename-testcases\n ds/multi-pack-index\n\n"},{"id":"351832","messageId":"xmqqh8lcgdzg.fsf@gitster-ct.c.googlers.com","threadId":"48835","inReplyTo":"xmqqlgaogeff.fsf@gitster-ct.c.googlers.com","subject":"Re: What's (not) cooking","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-06T23:07:31Z","receivedAt":"2018-07-06T23:07:37Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> I'll be pushing out the integration branches with some updates, but\n> there is no change in 'next' and below. The following topics I gave\n> a quick look and gave them topic branches, but I had trouble merging\n> them in 'pu' and making them work correctly or pass the tests, so\n> they are not part of 'pu' in today's pushout.\n>\n> pk/rebase-in-c\n> en/dirty-merge-fixes\n> en/t6036-merge-recursive-tests\n> en/t6042-insane-merge-rename-testcases\n> ds/multi-pack-index\n\nAlso I ran out of time looking at various interesting things that\nhappened during US holiday, and didn't get around to a few\ninteresting topics. So they are not even in the above \"not in pu\"\nlist, but they did hit my mailbox. I just haven't got around to\nthem yet.\n"},{"id":"351836","messageId":"CABPp-BFs1gYzBY5+QrrLEB5kJTaierSGDnYWs=5HKRcPksx9cw@mail.gmail.com","threadId":"48835","inReplyTo":"xmqqlgaogeff.fsf@gitster-ct.c.googlers.com","subject":"Re: What's (not) cooking","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-07-07T02:16:04Z","receivedAt":"2018-07-07T02:16:09Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano wrote:\n> I'll be pushing out the integration branches with some updates, but\n> there is no change in 'next' and below. The following topics I gave\n> a quick look and gave them topic branches, but I had trouble merging\n> them in 'pu' and making them work correctly or pass the tests, so\n> they are not part of 'pu' in today's pushout.\n>\n> pk/rebase-in-c\n> en/dirty-merge-fixes\n> en/t6036-merge-recursive-tests\n> en/t6042-insane-merge-rename-testcases\n> ds/multi-pack-index\n\nIt looks to me like the main problem is that pu itself has lots of\ntest failures. It seems to bisect down to\nkg/gc-auto-windows-workaround. If I revert commit ac9d3fdbebbd (\"gc\n--auto: clear repository before auto packing\", 2018-07-04), then pu\npasses tests again for me. With that reverted, I can merge\nen/t6036-merge-recursive-tests and\nen/t6042-insane-merge-rename-testcases without conflicts and the tests\npass without incident.\n\nThe other three topics all have merge conflicts.\n\nen/dirty-merge-fixes has a small conflict with the new topic\nnd/use-the-index-compat-less, which I mentioned as a possibility in\nthe cover letter to my series. I'm happy to do whatever makes it\neasiest for you to pick up; I can easily rebase on that topic branch,\nbut I thought you wanted to see that topic redone first (to avoid\n\"useless churn\"), so I'm unsure what the right next step is.\n"},{"id":"351844","messageId":"nycvar.QRO.7.76.6.1807071403320.75@tvgsbejvaqbjf.bet","threadId":"48835","inReplyTo":"xmqqlgaogeff.fsf@gitster-ct.c.googlers.com","subject":"Re: What's (not) cooking","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-07T12:08:33Z","receivedAt":"2018-07-07T12:25:39Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 6 Jul 2018, Junio C Hamano wrote:\n\n> I'll be pushing out the integration branches with some updates, but\n> there is no change in 'next' and below. The following topics I gave\n> a quick look and gave them topic branches, but I had trouble merging\n> them in 'pu' and making them work correctly or pass the tests, so\n> they are not part of 'pu' in today's pushout.\n> \n> pk/rebase-in-c\n> en/dirty-merge-fixes\n> en/t6036-merge-recursive-tests\n> en/t6042-insane-merge-rename-testcases\n> ds/multi-pack-index\n\nQuick note that `pu` is broken on Windows:\n\nhttps://git-for-windows.visualstudio.com/git/git%20Team/_build/results?buildId=11901&view=logs\n\nOne quite serious looking symptom is this (line 169728 in the log):\n\n2018-07-07T00:25:33.9171932Z ./test-lib.sh: line 664: 4516 Segmentation\nfault git gc\n\nAs you know, some time ago I tried to implement an automated build that\nauto-bisects issues like this, and unfortunately I had to disable this\nbecause it regularly ran out of time after 4h to bisect through the\ncomplex commit history (due to the fact that many branches in `pu` are not\nbased on `master` but on commits that are way back in the past, and an\nautomated build cannot retain information easily such as \"this commit was\nclean, and please do not bother bisecting past it\".\n\nAnd sadly, previous tests of `pu` (see\nhttps://git-for-windows.visualstudio.com/git/_build/index?definitionId=1&_a=history)\nwere failing on Windows already in the compile stage, see\ne.g. https://git-for-windows.visualstudio.com/git/git%20Team/_build/results?buildId=11612&view=logs\n\nSo I have no idea what caused this `gc` breakage.\n\nCiao,\nDscho\n"},{"id":"351845","messageId":"nycvar.QRO.7.76.6.1807071411090.75@tvgsbejvaqbjf.bet","threadId":"48835","inReplyTo":"CABPp-BFs1gYzBY5+QrrLEB5kJTaierSGDnYWs=5HKRcPksx9cw@mail.gmail.com","subject":"Re: What's (not) cooking","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-07-07T12:11:49Z","receivedAt":"2018-07-07T12:36:55Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Elijah,\n\nOn Fri, 6 Jul 2018, Elijah Newren wrote:\n\n> On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano wrote:\n> > I'll be pushing out the integration branches with some updates, but\n> > there is no change in 'next' and below. The following topics I gave\n> > a quick look and gave them topic branches, but I had trouble merging\n> > them in 'pu' and making them work correctly or pass the tests, so\n> > they are not part of 'pu' in today's pushout.\n> >\n> > pk/rebase-in-c\n> > en/dirty-merge-fixes\n> > en/t6036-merge-recursive-tests\n> > en/t6042-insane-merge-rename-testcases\n> > ds/multi-pack-index\n> \n> It looks to me like the main problem is that pu itself has lots of\n> test failures. It seems to bisect down to\n> kg/gc-auto-windows-workaround. If I revert commit ac9d3fdbebbd (\"gc\n> --auto: clear repository before auto packing\", 2018-07-04), then pu\n> passes tests again for me.\n\nIs this the segmentation fault about which I just sent a mail?\n\nCiao,\nDscho\n"},{"id":"351846","messageId":"CABPp-BHRE5ygBaXEkrmB_2-YKhq2Mr_Hr9Mg4PbUK_8-EmYU+Q@mail.gmail.com","threadId":"48835","inReplyTo":"nycvar.QRO.7.76.6.1807071411090.75@tvgsbejvaqbjf.bet","subject":"Re: What's (not) cooking","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-07-07T15:34:06Z","receivedAt":"2018-07-07T15:34:11Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Hi Dscho,\n\nOn Sat, Jul 7, 2018 at 5:11 AM, Johannes Schindelin\n wrote:\n> Hi Elijah,\n>\n> On Fri, 6 Jul 2018, Elijah Newren wrote:\n>\n>> On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano wrote:\n>> > I'll be pushing out the integration branches with some updates, but\n>> > there is no change in 'next' and below. The following topics I gave\n>> > a quick look and gave them topic branches, but I had trouble merging\n>> > them in 'pu' and making them work correctly or pass the tests, so\n>> > they are not part of 'pu' in today's pushout.\n>> >\n>> > pk/rebase-in-c\n>> > en/dirty-merge-fixes\n>> > en/t6036-merge-recursive-tests\n>> > en/t6042-insane-merge-rename-testcases\n>> > ds/multi-pack-index\n>>\n>> It looks to me like the main problem is that pu itself has lots of\n>> test failures. It seems to bisect down to\n>> kg/gc-auto-windows-workaround. If I revert commit ac9d3fdbebbd (\"gc\n>> --auto: clear repository before auto packing\", 2018-07-04), then pu\n>> passes tests again for me.\n>\n> Is this the segmentation fault about which I just sent a mail?\n\nYes, this is is a gc segfault issue. It looks like every test calling\ngit gc will fail because of it, I even saw a \"nothing to pack\" message\nor something like that followed by a segfault.\n"},{"id":"351860","messageId":"20180707225445.GA6152@infogroep.be","threadId":"48835","inReplyTo":"CABPp-BHRE5ygBaXEkrmB_2-YKhq2Mr_Hr9Mg4PbUK_8-EmYU+Q@mail.gmail.com","subject":"Re: What's (not) cooking","fromName":"Kim Gybels","fromEmail":"kgybels@infogroep.be","sentAt":"2018-07-07T22:54:45Z","receivedAt":"2018-07-07T23:04:34Z","isPatch":false,"sender":{"key":"kgybels@infogroep.be","avatar":"https://avatars.githubusercontent.com/u/2051188?v=4"},"body":"On (07/07/18 08:34), Elijah Newren wrote:\n> Hi Dscho,\n> \n> On Sat, Jul 7, 2018 at 5:11 AM, Johannes Schindelin\n> wrote:\n> > Hi Elijah,\n> >\n> > On Fri, 6 Jul 2018, Elijah Newren wrote:\n> >\n> >> On Fri, Jul 6, 2018 at 3:57 PM, Junio C Hamano wrote:\n> >> > I'll be pushing out the integration branches with some updates, but\n> >> > there is no change in 'next' and below. The following topics I gave\n> >> > a quick look and gave them topic branches, but I had trouble merging\n> >> > them in 'pu' and making them work correctly or pass the tests, so\n> >> > they are not part of 'pu' in today's pushout.\n> >> >\n> >> > pk/rebase-in-c\n> >> > en/dirty-merge-fixes\n> >> > en/t6036-merge-recursive-tests\n> >> > en/t6042-insane-merge-rename-testcases\n> >> > ds/multi-pack-index\n> >>\n> >> It looks to me like the main problem is that pu itself has lots of\n> >> test failures. It seems to bisect down to\n> >> kg/gc-auto-windows-workaround. If I revert commit ac9d3fdbebbd (\"gc\n> >> --auto: clear repository before auto packing\", 2018-07-04), then pu\n> >> passes tests again for me.\n> >\n> > Is this the segmentation fault about which I just sent a mail?\n> \n> Yes, this is is a gc segfault issue. It looks like every test calling\n> git gc will fail because of it, I even saw a \"nothing to pack\" message\n> or something like that followed by a segfault.\n\nSorry, I forgot to run the tests for v2 of my patch. I'll be more\ncareful in the future.\n\n-Kim\n"},{"id":"351943","messageId":"3d8bc7b8-b7be-4583-469e-6b962607b3a7@gmail.com","threadId":"48835","inReplyTo":"xmqqlgaogeff.fsf@gitster-ct.c.googlers.com","subject":"Re: What's (not) cooking","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2018-07-09T13:50:24Z","receivedAt":"2018-07-09T13:50:29Z","isPatch":false,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 7/6/2018 6:57 PM, Junio C Hamano wrote:\n> I'll be pushing out the integration branches with some updates, but\n> there is no change in 'next' and below. The following topics I gave\n> a quick look and gave them topic branches, but I had trouble merging\n> them in 'pu' and making them work correctly or pass the tests, so\n> they are not part of 'pu' in today's pushout.\n>\n> pk/rebase-in-c\n> en/dirty-merge-fixes\n> en/t6036-merge-recursive-tests\n> en/t6042-insane-merge-rename-testcases\n> ds/multi-pack-index\n\nI tested merging ds/multi-pack-index against the latest pu and the only \nissue I had was with header files being added to 'packfile.c' and \n'building/repack.c'. Both were that I added \"#include \" and \ncc/remote-odb added \"#include \".\n\nAfter resolving those conflicts, I could compile and test as normal. My \nseries did not include any new test failures to these that are already \nfailing on current pu:\n\nt0410-partial-clone.sh                           (Wstat: 256 Tests: 16 \nFailed: 2)\n   Failed tests:  15-16\n   Non-zero exit status: 1\nt1302-repo-version.sh                            (Wstat: 256 Tests: 15 \nFailed: 1)\n   Failed test:  15\n   Non-zero exit status: 1\nt1304-default-acl.sh                             (Wstat: 256 Tests: 4 \nFailed: 1)\n   Failed test:  4\n   Non-zero exit status: 1\nt3306-notes-prune.sh                             (Wstat: 256 Tests: 12 \nFailed: 2)\n   Failed tests:  3, 10\n   Non-zero exit status: 1\nt5304-prune.sh                                   (Wstat: 256 Tests: 26 \nFailed: 11)\n   Failed tests:  1, 4, 6, 12-18, 20\n   Non-zero exit status: 1\nt5502-quickfetch.sh                              (Wstat: 256 Tests: 7 \nFailed: 1)\n   Failed test:  7\n   Non-zero exit status: 1\nt5318-commit-graph.sh                            (Wstat: 256 Tests: 63 \nFailed: 1)\n   Failed test:  41\n   Non-zero exit status: 1\nt5500-fetch-pack.sh                              (Wstat: 256 Tests: 356 \nFailed: 1)\n   Failed test:  43\n   Non-zero exit status: 1\nt6014-rev-list-all.sh                            (Wstat: 256 Tests: 4 \nFailed: 1)\n   Failed test:  3\n   Non-zero exit status: 1\nt6500-gc.sh                                      (Wstat: 256 Tests: 10 \nFailed: 5)\n   Failed tests:  2-3, 6-7, 9\n   Non-zero exit status: 1\nt6501-freshen-objects.sh                         (Wstat: 256 Tests: 29 \nFailed: 7)\n   Failed tests:  7, 12, 20, 25, 27-29\n   Non-zero exit status: 1\nt7701-repack-unpack-unreachable.sh               (Wstat: 256 Tests: 7 \nFailed: 1)\n   Failed test:  5\n   Non-zero exit status: 1\nt9300-fast-import.sh                             (Wstat: 256 Tests: 183 \nFailed: 1)\n   Failed test:  88\n   Non-zero exit status: 1\n\nShould I rebase onto cc/remote-odb to avoid these conflicts in the \nfuture? Or, were there more merge conflicts with the other \"not cooking\" \nbranches?\n\nThanks,\n-Stolee\n"},{"id":"351952","messageId":"xmqqlgakfkus.fsf@gitster-ct.c.googlers.com","threadId":"48835","inReplyTo":"3d8bc7b8-b7be-4583-469e-6b962607b3a7@gmail.com","subject":"Re: What's (not) cooking","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-09T16:13:31Z","receivedAt":"2018-07-09T16:13:36Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Derrick Stolee writes:\n\n> On 7/6/2018 6:57 PM, Junio C Hamano wrote:\n>> I'll be pushing out the integration branches with some updates, but\n>> there is no change in 'next' and below. The following topics I gave\n>> a quick look and gave them topic branches, but I had trouble merging\n>> them in 'pu' and making them work correctly or pass the tests, so\n>> they are not part of 'pu' in today's pushout.\n>>\n>> pk/rebase-in-c\n>> en/dirty-merge-fixes\n>> en/t6036-merge-recursive-tests\n>> en/t6042-insane-merge-rename-testcases\n>> ds/multi-pack-index\n>\n> I tested merging ds/multi-pack-index against the latest pu and the\n> only issue I had was with header files being added to 'packfile.c' and\n> 'building/repack.c'. Both were that I added \"#include \" and\n> cc/remote-odb added \"#include \".\n\nI think ds/multi-pack-index didn't have any difficult textual merge\nconflicts. I ran out of time making 'pu' build with new topics and\nlisted the ones that were left behind. As Elijah already\nidentified, there was a bad apple not listed above that was in 'pu'\nthat made the tests fail, so the above is not even a complete list\nof \"bad\" topics. It was merely an \"I have them but 'pu' doesn't\ninclude them\" list.\n\nThanks.\n"}]}