{"thread":{"id":"44432","subject":"2.11.0-rc1 will not be tagged for a few days","startedAt":"2016-11-07T02:32:14Z","lastAt":"2016-11-12T13:33:39Z","messageCount":21,"participants":["Junio C Hamano","Jeff King","Johannes Sixt","Johannes Schindelin","Lars Schneider"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"305473","messageId":"xmqqk2cgc95m.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":null,"subject":"2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-07T02:32:05Z","receivedAt":"2016-11-07T02:32:14Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I regret to report that I won't be able to tag 2.11-rc1 as scheduled\nin tinyurl.com/gitCal (I am feverish and my brain is not keeping\ntrack of things correctly) any time soon. I'll report back an\nupdated schedule when able.\n\nI'd appreciate that people keep discussing and exchanging patches\nthat will not be in 2.11 final to give a head-start to topics so\nthat people can agree on the designs and implementations in the\nmeantime, but one thing I'd like to see when I come back is somebody\ntell me (when asked) what fix-up pathes that are \"must to apply, or\nthere is no point tagging 2.11-rc1 while keeping it broken\" are\nfound on the list. I am aware of only two right now (\"cast enum to\nint to work around compiler warning\", in Dscho's prepare sequencer\nseries, and \"wc -l may give leading whitespace\" fix J6t pointed out\nin Lars's filter process series), but it is more than likely that I\nam missing a few more.\n\nThanks. Going back to bed...\n"},{"id":"305522","messageId":"20161108004038.a7gyoe6wpucxjmvz@sigill.intra.peff.net","threadId":"44432","inReplyTo":"xmqqk2cgc95m.fsf@gitster.mtv.corp.google.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-11-08T00:40:38Z","receivedAt":"2016-11-08T00:40:45Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Nov 06, 2016 at 06:32:05PM -0800, Junio C Hamano wrote:\n\n> I regret to report that I won't be able to tag 2.11-rc1 as scheduled\n> in tinyurl.com/gitCal (I am feverish and my brain is not keeping\n> track of things correctly) any time soon. I'll report back an\n> updated schedule when able.\n\nTake your time. Even if we end up bumping the release by a whole week, I\ndon't think it's a big deal (which seems likely given the holiday in the\nmiddle, unless you really want to release on Thanksgiving).\n\n> found on the list. I am aware of only two right now (\"cast enum to\n> int to work around compiler warning\", in Dscho's prepare sequencer\n> series, and \"wc -l may give leading whitespace\" fix J6t pointed out\n> in Lars's filter process series), but it is more than likely that I\n> am missing a few more.\n\nIn addition to J6t's fix in t0021, we need mine that you queued in\njk/filter-process-fix.\n\nI think we also need to make a final decision on the indent/compaction\nheuristic naming. After reading Michael's [0], and the claim by you and\nStefan that the \"compaction\" name was declared sufficiently experimental\nthat we could later take it away, I'm inclined to follow this plan:\n\n 1. Ship v2.11 with what is in master; i.e., both compaction and indent\n heuristics, triggerable by config or command line.\n\n 2. Post-v2.11, retire the compaction heuristic as a failed experiment.\n Keeping it in v2.11 doesn't hurt anything (it was already\n released), and lets us take our time coming up with and cooking the\n patch.\n\n 3. Post-v2.11, flip the default for diff.indentHeuristic to \"true\".\n Keep at least the command line option around indefinitely for\n experimenting (i.e., \"this diff looks funny; I wonder if\n --no-indent-heuristic makes it look better\").\n\n Config option can either stay or go at that point. I have no\n preference.\n\nThe nice thing about that plan is it punts on merging any new code to\npost-v2.11. :)\n\nAnother possible regression came up today in [1]. I haven't worked up a\npatch yet, but I'll do so in the next day or so.\n\nI think that's where we're at now. I'll keep collecting and can give you\nthe full list when you're back in action.\n\nGet well.\n\n[0] http://public-inbox.org/git/8dbbd28b-af60-5e66-ae27-d7cddca233dc@alum.mit.edu/\n\n[1] http://public-inbox.org/git/20161108003034.apydvv3bav3s7ehq@sigill.intra.peff.net/\n"},{"id":"305536","messageId":"65a1bb6d-e924-21aa-70d3-303ebdc499f1@kdbg.org","threadId":"44432","inReplyTo":"20161108004038.a7gyoe6wpucxjmvz@sigill.intra.peff.net","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2016-11-08T06:25:26Z","receivedAt":"2016-11-08T06:26:00Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 08.11.2016 um 01:40 schrieb Jeff King:\n> In addition to J6t's fix in t0021, ...\n\nJust to get things straight: Of my two patches, this one (\"uniq -c \nvariations\")\n\nhttps://public-inbox.org/git/c842e0a7-b032-e0c4-0995-f11d93c17c0a@kdbg.org/\n\nis a bug fix in my environment, and I have a suspicion that it is also \nrequired in other less frequently tested environments (Solaris? BSD \nvariants?)\n\nThe other one, which you most likely remember as dealing with \"leading \nwhitespace in wc -c\"\n\nhttps://public-inbox.org/git/b87ddffd-3de1-4481-b484-9f03a73b6ad1@kdbg.org/\n\nis \"only\" an optimization. The link points at the final version.\n\n-- Hannes\n\n"},{"id":"305587","messageId":"20161108214825.yo37kvoqkeucuqgg@sigill.intra.peff.net","threadId":"44432","inReplyTo":"65a1bb6d-e924-21aa-70d3-303ebdc499f1@kdbg.org","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-11-08T21:48:25Z","receivedAt":"2016-11-08T21:48:32Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Nov 08, 2016 at 07:25:26AM +0100, Johannes Sixt wrote:\n\n> Am 08.11.2016 um 01:40 schrieb Jeff King:\n> > In addition to J6t's fix in t0021, ...\n> \n> Just to get things straight: Of my two patches, this one (\"uniq -c\n> variations\")\n> \n> https://public-inbox.org/git/c842e0a7-b032-e0c4-0995-f11d93c17c0a@kdbg.org/\n> \n> is a bug fix in my environment, and I have a suspicion that it is also\n> required in other less frequently tested environments (Solaris? BSD\n> variants?)\n> \n> The other one, which you most likely remember as dealing with \"leading\n> whitespace in wc -c\"\n> \n> https://public-inbox.org/git/b87ddffd-3de1-4481-b484-9f03a73b6ad1@kdbg.org/\n> \n> is \"only\" an optimization. The link points at the final version.\n\nThanks for clarifying. I think it's probably worth applying both.\n\nI'm collecting v2.11-rc1 topics in the \"refs/heads/for-junio/\" section\nof git://github.com/peff/git.git.\n\nI've also got proposed merges for \"master\" there, though note that none\nof the topics has actually cooked at all in next (the fixes are trivial\nenough that it may be OK, though).\n\n-Peff\n"},{"id":"305616","messageId":"xmqqoa1p9nf0.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":"20161108214825.yo37kvoqkeucuqgg@sigill.intra.peff.net","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-09T06:29:07Z","receivedAt":"2016-11-09T06:29:16Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> I'm collecting v2.11-rc1 topics in the \"refs/heads/for-junio/\" section\n> of git://github.com/peff/git.git.\n>\n> I've also got proposed merges for \"master\" there, though note that none\n> of the topics has actually cooked at all in next (the fixes are trivial\n> enough that it may be OK, though).\n\nI am not quite back up at full steam yet, but I expect I'd be more\nor less functioning tomorrow, so I'll fetch them from your tree and\ncontinue.\n\nThanks.\n\n\n"},{"id":"305638","messageId":"20161109165125.t4x2w7u5uxe57xm2@sigill.intra.peff.net","threadId":"44432","inReplyTo":"xmqqoa1p9nf0.fsf@gitster.mtv.corp.google.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-11-09T16:51:25Z","receivedAt":"2016-11-09T16:51:32Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Nov 08, 2016 at 10:29:07PM -0800, Junio C Hamano wrote:\n\n> Jeff King writes:\n> \n> > I'm collecting v2.11-rc1 topics in the \"refs/heads/for-junio/\" section\n> > of git://github.com/peff/git.git.\n> >\n> > I've also got proposed merges for \"master\" there, though note that none\n> > of the topics has actually cooked at all in next (the fixes are trivial\n> > enough that it may be OK, though).\n> \n> I am not quite back up at full steam yet, but I expect I'd be more\n> or less functioning tomorrow, so I'll fetch them from your tree and\n> continue.\n\nIt looks like Johannes prefers replacements for some of the fixes from\nyesterday. Just FYI that you probably do not want to take the \"master\" I\npushed there literally, but instead just view it as a proposed list of\ntopics.\n\nI did not really expect you to take it literally in the first place.\nIt's just that I found myself writing up notes like \"this should be\nmerged\", and it occurred to me that I could communicate the same things\nby sending you a proposed history. So I'm curious if you find dissecting\nit via \"git log\" more or less convenient than a list of notes. :)\n\n-Peff\n"},{"id":"305660","messageId":"xmqq1syk8bw8.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":"20161109165125.t4x2w7u5uxe57xm2@sigill.intra.peff.net","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-09T23:35:35Z","receivedAt":"2016-11-09T23:35:43Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> It's just that I found myself writing up notes like \"this should be\n> merged\", and it occurred to me that I could communicate the same things\n> by sending you a proposed history. So I'm curious if you find dissecting\n> it via \"git log\" more or less convenient than a list of notes. :)\n\nYes, I think this is a very readable form of communication.\n\nWhat's especially nice in what you did is that comparing outputs of\nthese two commands\n\n $ git log --no-merges --oneline master..peff/for-junio/master\n $ git log --no-merges --oneline ^pu master..peff/for-junio/master\n\nclearly shows that you reused what I already had in 'pu' and the\nones missing from 'pu' are the ones I need to check and possibly\nmay want to sign-off myself.\n\nI also need to note that while this is very handy format for the\nrecipient, hence a very good way to do \"pass the pumpkin\" between\nmaintainers, it is a less \"open\" way of communication than laying\nout everything on the list (cf. http://youtu.be/L8OOzaqS37s), but\nit is the most appropriate method in this case, I would think.\n\n> It looks like Johannes prefers replacements for some of the fixes from\n> yesterday.\n\nAs to that change, I agree with you that I do not care too deeply\nabout the shape of an interim step as long as the finished product\nuses the better one between the alternatives, but at the same time,\nbecause we are including it as a hot-fix in a released product, even\nthough it is an interim step in the bigger picture, I want it to be\nusing the better one, too. So I am leaning towards taking what you\nqueued for me for the reasons you stated in the other thread [*1*].\n\nThat would probably mean Dscho needs a bit of rebase in the\nremaining parts of his series that adds new elements to the enum,\nbut I am hoping that he can afford that time now in the feature\nfreeze period. If we take the _INVALID thing instead now, the\nremaining series from Dscho that we would review and queue for the\nnext cycle would need to begin with a \"fixup\" patch that stops doing\nthe _INVALID thing and instead using the \"compare after casting to\nsize_t\", so it is just the matter of doing the adjustment before or\nafter the remainder of the series are posted on the list for the\nnext release, and the smaller number of \"oops that was not nice,\nlet's fix it\" patches in the published history, the better the long\nterm health of the project, I would think.\n\nThe other fixes in your collection looked all sensible. Thanks.\n\n\n[Footnote]\n\n*1* The convention of keeping _INVALID at the end can be arguably\n made safe from future programmer screw-ups, as long as it is\n guarded by a good comment nearby. But the solution to cast\n would avoid having to have that potential brittleness in the\n first place. I find the other merit of taking care of negative\n enum automatically quite attractive, too.\n"},{"id":"305662","messageId":"xmqqshr06x3y.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":"20161108004038.a7gyoe6wpucxjmvz@sigill.intra.peff.net","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-09T23:40:17Z","receivedAt":"2016-11-09T23:40:23Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> I think we also need to make a final decision on the indent/compaction\n> heuristic naming. After reading Michael's [0], and the claim by you and\n> Stefan that the \"compaction\" name was declared sufficiently experimental\n> that we could later take it away, I'm inclined to follow this plan:\n>\n> 1. Ship v2.11 with what is in master; i.e., both compaction and indent\n> heuristics, triggerable by config or command line.\n>\n> 2. Post-v2.11, retire the compaction heuristic as a failed experiment.\n> Keeping it in v2.11 doesn't hurt anything (it was already\n> released), and lets us take our time coming up with and cooking the\n> patch.\n>\n> 3. Post-v2.11, flip the default for diff.indentHeuristic to \"true\".\n> Keep at least the command line option around indefinitely for\n> experimenting (i.e., \"this diff looks funny; I wonder if\n> --no-indent-heuristic makes it look better\").\n>\n> Config option can either stay or go at that point. I have no\n> preference.\n>\n> The nice thing about that plan is it punts on merging any new code to\n> post-v2.11. :)\n\nOK, I can go with that plan. Thanks for an outline.\n"},{"id":"305728","messageId":"xmqqoa1n57u4.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":"xmqqk2cgc95m.fsf@gitster.mtv.corp.google.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-10T21:43:47Z","receivedAt":"2016-11-10T21:44:08Z","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 report back an updated schedule when able.\n\nI pushed some updates out on 'master' today. Between 'master' and\n'pu' on the first-parent history there is a merge 52975d2b1f (\"Merge\nbranch 'ls/macos-update' into jch\", 2016-11-10) and that matches\nwhat I expect to be in -rc1 tomorrow (modulo RelNotes and the actual\nversion tag), unless there is a showstopper regresion reported, in\nwhich case we may want to first look into reverting the whole series\nthat introduced the regression before considering to pile on fix-up\npatches.\n\nhttp://tinyurl.com/gitCal has been redrawn, with -rc1 scheduled for\ntomorrow on 11th, -rc2 on the 17th, and final on the 23rd.\n\nThanks.\n"},{"id":"305746","messageId":"xmqqbmxm50bl.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":"xmqqoa1n57u4.fsf@gitster.mtv.corp.google.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-11T00:26:06Z","receivedAt":"2016-11-11T00:26:15Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Junio C Hamano writes:\n>\n>> I'll report back an updated schedule when able.\n>\n> I pushed some updates out on 'master' today. Between 'master' and\n> 'pu' on the first-parent history there is a merge 52975d2b1f (\"Merge\n> branch 'ls/macos-update' into jch\", 2016-11-10) and that matches\n> what I expect to be in -rc1 tomorrow (modulo RelNotes and the actual\n> version tag), unless there is a showstopper regresion reported, in\n> which case we may want to first look into reverting the whole series\n> that introduced the regression before considering to pile on fix-up\n> patches.\n\nPlease make that 71d1bcb661 (\"Merge branch 'ls/macos-update' into\njch\", 2016-11-10); among the three extra topics that is not yet in\n'master', as/merge-attr-sleep topic has been updated with a better\nfix from Dscho.\n\nThanks.\n"},{"id":"305789","messageId":"alpine.DEB.2.20.1611111711210.3746@virtualbox","threadId":"44432","inReplyTo":"xmqqoa1n57u4.fsf@gitster.mtv.corp.google.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-11-11T16:13:02Z","receivedAt":"2016-11-11T16:13:28Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Thu, 10 Nov 2016, Junio C Hamano wrote:\n\n> Junio C Hamano writes:\n> \n> > I'll report back an updated schedule when able.\n> \n> I pushed some updates out on 'master' today.\n\nWhich means that t0021 is now broken also on `master` when running in Git\nfor Windows' SDK.\n\nTo add insult to injury, t5615 is now broken, too. I do not recall it\nbeing broken in any of my CI builds in any of the integration branches\nbefore.\n\nCiao,\nDscho\n"},{"id":"305793","messageId":"alpine.DEB.2.20.1611111758150.3746@virtualbox","threadId":"44432","inReplyTo":"alpine.DEB.2.20.1611111711210.3746@virtualbox","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-11-11T17:02:01Z","receivedAt":"2016-11-11T17:02:14Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 11 Nov 2016, Johannes Schindelin wrote:\n\n> On Thu, 10 Nov 2016, Junio C Hamano wrote:\n> \n> > Junio C Hamano writes:\n> > \n> > > I'll report back an updated schedule when able.\n> > \n> > I pushed some updates out on 'master' today.\n> \n> Which means that t0021 is now broken also on `master` when running in Git\n> for Windows' SDK.\n\nTo be precise, it says:\n\n\t# failed 7 among 23 test(s)\n\nRunning with -i -v -x shows that the first broken test is this one:\n\n-- snipsnap --\nexpecting success:\n test_config_global filter.protocol.process \"rot13-filter.pl clean smudge\" &&\n test_config_global filter.protocol.required true &&\n rm -rf repo &&\n mkdir repo &&\n (\n cd repo &&\n git init &&\n\n echo \"git-stderr.log\" >.gitignore &&\n echo \"*.r filter=protocol\" >.gitattributes &&\n git add . &&\n git commit . -m \"test commit 1\" &&\n git branch empty-branch &&\n\n cp \"$TEST_ROOT/test.o\" test.r &&\n cp \"$TEST_ROOT/test2.o\" test2.r &&\n mkdir testsubdir &&\n cp \"$TEST_ROOT/test3 'sq',\\$x.o\" \"testsubdir/test3 'sq',\\$x.r\" &&\n >test4-empty.r &&\n\n S=$(file_size test.r) &&\n S2=$(file_size test2.r) &&\n S3=$(file_size \"testsubdir/test3 'sq',\\$x.r\") &&\n\n filter_git add . &&\n cat >expected.log <<-EOF &&\n START\n init handshake complete\n IN: clean test.r $S [OK] -- OUT: $S . [OK]\n IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK]\n IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK]\n IN: clean testsubdir/test3 'sq',\\$x.r $S3 [OK] -- OUT: $S3 . [OK]\n STOP\n EOF\n test_cmp_count expected.log rot13-filter.log &&\n\n filter_git commit . -m \"test commit 2\" &&\n cat >expected.log <<-EOF &&\n START\n init handshake complete\n IN: clean test.r $S [OK] -- OUT: $S . [OK]\n IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK]\n IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK]\n IN: clean testsubdir/test3 'sq',\\$x.r $S3 [OK] -- OUT: $S3 . [OK]\n IN: clean test.r $S [OK] -- OUT: $S . [OK]\n IN: clean test2.r $S2 [OK] -- OUT: $S2 . [OK]\n IN: clean test4-empty.r 0 [OK] -- OUT: 0 [OK]\n IN: clean testsubdir/test3 'sq',\\$x.r $S3 [OK] -- OUT: $S3 . [OK]\n STOP\n EOF\n test_cmp_count expected.log rot13-filter.log &&\n\n rm -f test2.r \"testsubdir/test3 'sq',\\$x.r\" &&\n\n filter_git checkout --quiet --no-progress . &&\n cat >expected.log <<-EOF &&\n START\n init handshake complete\n IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK]\n IN: smudge testsubdir/test3 'sq',\\$x.r $S3 [OK] -- OUT: $S3 . [OK]\n STOP\n EOF\n test_cmp_exclude_clean expected.log rot13-filter.log &&\n\n filter_git checkout --quiet --no-progress empty-branch &&\n cat >expected.log <<-EOF &&\n START\n init handshake complete\n IN: clean test.r $S [OK] -- OUT: $S . [OK]\n STOP\n EOF\n test_cmp_exclude_clean expected.log rot13-filter.log &&\n\n filter_git checkout --quiet --no-progress master &&\n cat >expected.log <<-EOF &&\n START\n init handshake complete\n IN: smudge test.r $S [OK] -- OUT: $S . [OK]\n IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK]\n IN: smudge test4-empty.r 0 [OK] -- OUT: 0 [OK]\n IN: smudge testsubdir/test3 'sq',\\$x.r $S3 [OK] -- OUT: $S3 . [OK]\n STOP\n EOF\n test_cmp_exclude_clean expected.log rot13-filter.log &&\n\n test_cmp_committed_rot13 \"$TEST_ROOT/test.o\" test.r &&\n test_cmp_committed_rot13 \"$TEST_ROOT/test2.o\" test2.r &&\n test_cmp_committed_rot13 \"$TEST_ROOT/test3 'sq',\\$x.o\" \"testsubdir/test3 'sq',\\$x.r\"\n )\n\n++ test_config_global filter.protocol.process 'rot13-filter.pl clean smudge'\n++ test_when_finished 'test_unconfig --global '\\''filter.protocol.process'\\'''\n++ test 0 = 0\n++ test_cleanup='{ test_unconfig --global '\\''filter.protocol.process'\\''\n } && (exit \"$eval_ret\"); eval_ret=$?; :'\n++ git config --global filter.protocol.process 'rot13-filter.pl clean smudge'\n++ test_config_global filter.protocol.required true\n++ test_when_finished 'test_unconfig --global '\\''filter.protocol.required'\\'''\n++ test 0 = 0\n++ test_cleanup='{ test_unconfig --global '\\''filter.protocol.required'\\''\n } && (exit \"$eval_ret\"); eval_ret=$?; { test_unconfig --global '\\''filter.protocol.process'\\''\n } && (exit \"$eval_ret\"); eval_ret=$?; :'\n++ git config --global filter.protocol.required true\n++ rm -rf repo\n++ mkdir repo\n++ cd repo\n++ git init\nInitialized empty Git repository in C:/git-sdk-64/usr/src/git/wip2/t/trash directory.t0021-conversion/repo/.git/\n++ echo git-stderr.log\n++ echo '*.r filter=protocol'\n++ git add .\n++ git commit . -m 'test commit 1'\n[master (root-commit) aa5dd37] test commit 1\n Author: A U Thor \n 2 files changed, 2 insertions(+)\n create mode 100644 .gitattributes\n create mode 100644 .gitignore\n++ git branch empty-branch\n++ cp 'C:/git-sdk-64/usr/src/git/wip2/t/trash directory.t0021-conversion/test.o' test.r\n++ cp 'C:/git-sdk-64/usr/src/git/wip2/t/trash directory.t0021-conversion/test2.o' test2.r\n++ mkdir testsubdir\n++ cp 'C:/git-sdk-64/usr/src/git/wip2/t/trash directory.t0021-conversion/test3 '\\''sq'\\'',$x.o' 'testsubdir/test3 '\\''sq'\\'',$x.r'\n+++ file_size test.r\n+++ perl -e 'print -s $ARGV[0]' test.r\n+++ command /usr/bin/perl -e 'print -s $ARGV[0]' test.r\n+++ /usr/bin/perl -e 'print -s $ARGV[0]' test.r\n++ S=57\n+++ file_size test2.r\n+++ perl -e 'print -s $ARGV[0]' test2.r\n+++ command /usr/bin/perl -e 'print -s $ARGV[0]' test2.r\n+++ /usr/bin/perl -e 'print -s $ARGV[0]' test2.r\n++ S2=14\n+++ file_size 'testsubdir/test3 '\\''sq'\\'',$x.r'\n+++ perl -e 'print -s $ARGV[0]' 'testsubdir/test3 '\\''sq'\\'',$x.r'\n+++ command /usr/bin/perl -e 'print -s $ARGV[0]' 'testsubdir/test3 '\\''sq'\\'',$x.r'\n+++ /usr/bin/perl -e 'print -s $ARGV[0]' 'testsubdir/test3 '\\''sq'\\'',$x.r'\n++ S3=49\n++ filter_git add .\n++ rm -f rot13-filter.log\n++ git add .\n+ test_eval_ret_=128\n+ want_trace\n+ test t = t\n+ test t = t\n+ set +x\nerror: last command exited with $?=128\nnot ok 15 - required process filter should filter data\n#\n# test_config_global filter.protocol.process\n# \"rot13-filter.pl clean smudge\" &&\n# test_config_global filter.protocol.required true &&\n# rm -rf repo &&\n# mkdir repo &&\n# (\n# cd repo &&\n# git init &&\n#\n# echo \"git-stderr.log\" >.gitignore &&\n# echo \"*.r filter=protocol\" >.gitattributes &&\n# git add . &&\n# git commit . -m \"test commit 1\" &&\n# git branch empty-branch &&\n#\n# cp \"$TEST_ROOT/test.o\" test.r &&\n# cp \"$TEST_ROOT/test2.o\" test2.r &&\n# mkdir testsubdir &&\n# cp \"$TEST_ROOT/test3 'sq',\\$x.o\" \"testsubdir/test3\n# 'sq',\\$x.r\" &&\n# >test4-empty.r &&\n#\n# S=$(file_size test.r) &&\n# S2=$(file_size test2.r) &&\n# S3=$(file_size \"testsubdir/test3 'sq',\\$x.r\") &&\n#\n# filter_git add . &&\n# cat >expected.log <<-EOF &&\n# START\n# init handshake complete\n# IN: clean test.r $S [OK] -- OUT: $S . [OK]\n# IN: clean test2.r $S2 [OK] -- OUT: $S2 .\n# [OK]\n# IN: clean test4-empty.r 0 [OK] -- OUT: 0\n# [OK]\n# IN: clean testsubdir/test3 'sq',\\$x.r $S3\n# [OK] -- OUT: $S3 . [OK]\n# STOP\n# EOF\n# test_cmp_count expected.log rot13-filter.log &&\n#\n# filter_git commit . -m \"test commit 2\" &&\n# cat >expected.log <<-EOF &&\n# START\n# init handshake complete\n# IN: clean test.r $S [OK] -- OUT: $S . [OK]\n# IN: clean test2.r $S2 [OK] -- OUT: $S2 .\n# [OK]\n# IN: clean test4-empty.r 0 [OK] -- OUT: 0\n# [OK]\n# IN: clean testsubdir/test3 'sq',\\$x.r $S3\n# [OK] -- OUT: $S3 . [OK]\n# IN: clean test.r $S [OK] -- OUT: $S . [OK]\n# IN: clean test2.r $S2 [OK] -- OUT: $S2 .\n# [OK]\n# IN: clean test4-empty.r 0 [OK] -- OUT: 0\n# [OK]\n# IN: clean testsubdir/test3 'sq',\\$x.r $S3\n# [OK] -- OUT: $S3 . [OK]\n# STOP\n# EOF\n# test_cmp_count expected.log rot13-filter.log &&\n#\n# rm -f test2.r \"testsubdir/test3 'sq',\\$x.r\" &&\n#\n# filter_git checkout --quiet --no-progress . &&\n# cat >expected.log <<-EOF &&\n# START\n# init handshake complete\n# IN: smudge test2.r $S2 [OK] -- OUT: $S2 .\n# [OK]\n# IN: smudge testsubdir/test3 'sq',\\$x.r $S3\n# [OK] -- OUT: $S3 . [OK]\n# STOP\n# EOF\n# test_cmp_exclude_clean expected.log\n# rot13-filter.log &&\n#\n# filter_git checkout --quiet --no-progress\n# empty-branch &&\n# cat >expected.log <<-EOF &&\n# START\n# init handshake complete\n# IN: clean test.r $S [OK] -- OUT: $S . [OK]\n# STOP\n# EOF\n# test_cmp_exclude_clean expected.log\n# rot13-filter.log &&\n#\n# filter_git checkout --quiet --no-progress master\n# &&\n# cat >expected.log <<-EOF &&\n# START\n# init handshake complete\n# IN: smudge test.r $S [OK] -- OUT: $S .\n# [OK]\n# IN: smudge test2.r $S2 [OK] -- OUT: $S2 .\n# [OK]\n# IN: smudge test4-empty.r 0 [OK] -- OUT: 0\n# [OK]\n# IN: smudge testsubdir/test3 'sq',\\$x.r $S3\n# [OK] -- OUT: $S3 . [OK]\n# STOP\n# EOF\n# test_cmp_exclude_clean expected.log\n# rot13-filter.log &&\n#\n# test_cmp_committed_rot13 \"$TEST_ROOT/test.o\"\n# test.r &&\n# test_cmp_committed_rot13 \"$TEST_ROOT/test2.o\"\n# test2.r &&\n# test_cmp_committed_rot13 \"$TEST_ROOT/test3\n# 'sq',\\$x.o\" \"testsubdir/test3 'sq',\\$x.r\"\n# )\n#\n\n"},{"id":"305794","messageId":"4FF1825D-F699-4532-9B53-A673DFF00D8B@gmail.com","threadId":"44432","inReplyTo":"alpine.DEB.2.20.1611111711210.3746@virtualbox","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2016-11-11T17:05:00Z","receivedAt":"2016-11-11T17:05:09Z","isPatch":false,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 11 Nov 2016, at 17:13, Johannes Schindelin wrote:\n> \n> Hi Junio,\n> \n> On Thu, 10 Nov 2016, Junio C Hamano wrote:\n> \n>> Junio C Hamano writes:\n>> \n>>> I'll report back an updated schedule when able.\n>> \n>> I pushed some updates out on 'master' today.\n> \n> Which means that t0021 is now broken also on `master` when running in Git\n> for Windows' SDK.\n\nPart of the reason is that Hannes' squash got lost:\nhttp://public-inbox.org/git/d36d8b51-f2d7-a2f5-89ea-369f49556e10@kdbg.org/\n\n@Junio: Can you apply this (see discussion with Peff linked to email above).\n\n@Dscho:\nThere is still one remaining new issue with t0021 ... investigating!\n\n\n> To add insult to injury, t5615 is now broken, too. I do not recall it\n> being broken in any of my CI builds in any of the integration branches\n> before.\n\nConfirmed on my machine.\n\n- Lars"},{"id":"305799","messageId":"89DB812E-EC29-4D12-97EA-6E8FF6F86FE5@gmail.com","threadId":"44432","inReplyTo":"4FF1825D-F699-4532-9B53-A673DFF00D8B@gmail.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2016-11-11T17:31:36Z","receivedAt":"2016-11-11T17:31:45Z","isPatch":false,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 11 Nov 2016, at 18:05, Lars Schneider wrote:\n> \n> \n>> On 11 Nov 2016, at 17:13, Johannes Schindelin wrote:\n>> \n>> Hi Junio,\n>> \n>> On Thu, 10 Nov 2016, Junio C Hamano wrote:\n>> \n>>> Junio C Hamano writes:\n>>> \n>>>> I'll report back an updated schedule when able.\n>>> \n>>> I pushed some updates out on 'master' today.\n>> \n>> Which means that t0021 is now broken also on `master` when running in Git\n>> for Windows' SDK.\n> \n> Part of the reason is that Hannes' squash got lost:\n> http://public-inbox.org/git/d36d8b51-f2d7-a2f5-89ea-369f49556e10@kdbg.org/\n> \n> @Junio: Can you apply this (see discussion with Peff linked to email above).\n> \n> @Dscho:\n> There is still one remaining new issue with t0021 ... investigating!\n\n\"17 - required process filter should be used only for \"clean\" operation only\"\nseems flaky.\n\nI don't have any more time today but I will look into it tomorrow.\n\n- Lars"},{"id":"305801","messageId":"C3840B91-58E2-4563-9597-5EE514D97CC1@gmail.com","threadId":"44432","inReplyTo":"89DB812E-EC29-4D12-97EA-6E8FF6F86FE5@gmail.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2016-11-11T17:38:10Z","receivedAt":"2016-11-11T17:40:05Z","isPatch":false,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 11 Nov 2016, at 18:31, Lars Schneider wrote:\n> \n>> \n>> On 11 Nov 2016, at 18:05, Lars Schneider wrote:\n>> \n>> \n>>> On 11 Nov 2016, at 17:13, Johannes Schindelin wrote:\n>>> \n>>> Hi Junio,\n>>> \n>>> On Thu, 10 Nov 2016, Junio C Hamano wrote:\n>>> \n>>>> Junio C Hamano writes:\n>>>> \n>>>>> I'll report back an updated schedule when able.\n>>>> \n>>>> I pushed some updates out on 'master' today.\n>>> \n>>> Which means that t0021 is now broken also on `master` when running in Git\n>>> for Windows' SDK.\n>> \n>> Part of the reason is that Hannes' squash got lost:\n>> http://public-inbox.org/git/d36d8b51-f2d7-a2f5-89ea-369f49556e10@kdbg.org/\n>> \n>> @Junio: Can you apply this (see discussion with Peff linked to email above).\n>> \n>> @Dscho:\n>> There is still one remaining new issue with t0021 ... investigating!\n> \n> \"17 - required process filter should be used only for \"clean\" operation only\"\n> seems flaky.\n> \n> I don't have any more time today but I will look into it tomorrow.\n\nFWIW: This patch (which would be the right thing to do anyways) seems to fix \nthe flakyness but I can't be sure ... it needs to run longer...\n\ndiff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh\nindex 9ff5027..107766b 100755\n--- a/t/t0021-conversion.sh\n+++ b/t/t0021-conversion.sh\n@@ -29,8 +29,7 @@ file_size () {\n\n filter_git () {\n \trm -f rot13-filter.log &&\n-\tgit \"$@\" 2>git-stderr.log &&\n-\trm -f git-stderr.log\n+\tgit \"$@\" 2>/dev/null\n }\n\n # Compare two files and ensure that `clean` and `smudge` respectively are\n\n\n"},{"id":"305802","messageId":"xmqqeg2h3oeb.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":"4FF1825D-F699-4532-9B53-A673DFF00D8B@gmail.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-11T17:41:16Z","receivedAt":"2016-11-11T17:41:23Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Lars Schneider writes:\n\n> Part of the reason is that Hannes' squash got lost:\n> http://public-inbox.org/git/d36d8b51-f2d7-a2f5-89ea-369f49556e10@kdbg.org/\n>\n> @Junio: Can you apply this (see discussion with Peff linked to email above).\n\nThanks for a quick and usable report followed by a quick fix.\n"},{"id":"305814","messageId":"e0785e35-b43d-37ed-598d-b458daf3c355@kdbg.org","threadId":"44432","inReplyTo":"C3840B91-58E2-4563-9597-5EE514D97CC1@gmail.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2016-11-11T20:44:32Z","receivedAt":"2016-11-11T20:45:34Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 11.11.2016 um 18:38 schrieb Lars Schneider:\n>> On 11 Nov 2016, at 18:31, Lars Schneider wrote:\n>>> On 11 Nov 2016, at 18:05, Lars Schneider wrote:\n>>> @Dscho:\n>>> There is still one remaining new issue with t0021 ... investigating!\n>>\n>> \"17 - required process filter should be used only for \"clean\" operation only\"\n>> seems flaky.\n>>\n>> I don't have any more time today but I will look into it tomorrow.\n\nGood to know that I am not alone. This one fails consistently for me. I \ndug into it a bit today, but it drives me mad. Process Monitor reports \nthat the redirected-to file (git-stderr.log) gets marked as \"Delete \npending\" by git.exe, but I have absolutely no clue where this is coming \nfrom. Git.exe has no business fuzzing with the file; it just has to \nwrite() something into it, if at all. When 'git checkout' ends, the file \nis closed, and removed due to the \"Delete pending\" mark. At the same \ntime, git.exe finishes with non-zero exit code. For whatever reason.\n\n> FWIW: This patch (which would be the right thing to do anyways) seems to fix\n> the flakyness but I can't be sure ... it needs to run longer...\n>\n> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh\n> index 9ff5027..107766b 100755\n> --- a/t/t0021-conversion.sh\n> +++ b/t/t0021-conversion.sh\n> @@ -29,8 +29,7 @@ file_size () {\n>\n> filter_git () {\n> \trm -f rot13-filter.log &&\n> -\tgit \"$@\" 2>git-stderr.log &&\n> -\trm -f git-stderr.log\n> +\tgit \"$@\" 2>/dev/null\n\nIf I remove the redirection altogether, the test passes for me \nconsistently. The redirection isn't necessary anyway, it looks like a \ndebugging left-over.\n\n> }\n>\n> # Compare two files and ensure that `clean` and `smudge` respectively are\n>\n>\n\n-- Hannes\n\n"},{"id":"305816","messageId":"xmqq1syh3fjx.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":"e0785e35-b43d-37ed-598d-b458daf3c355@kdbg.org","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-11T20:52:18Z","receivedAt":"2016-11-11T20:52:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt writes:\n\n> Good to know that I am not alone. This one fails consistently for\n> me. I dug into it a bit today, but it drives me mad. Process Monitor\n> reports that the redirected-to file (git-stderr.log) gets marked as\n> \"Delete pending\" by git.exe, but I have absolutely no clue where this\n> is coming from. Git.exe has no business fuzzing with the file; it just\n> has to write() something into it, if at all. When 'git checkout' ends,\n> the file is closed, and removed due to the \"Delete pending\" mark. At\n> the same time, git.exe finishes with non-zero exit code. For whatever\n> reason.\n>\n>> FWIW: This patch (which would be the right thing to do anyways) seems to fix\n>> the flakyness but I can't be sure ... it needs to run longer...\n>>\n>> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh\n>> index 9ff5027..107766b 100755\n>> --- a/t/t0021-conversion.sh\n>> +++ b/t/t0021-conversion.sh\n>> @@ -29,8 +29,7 @@ file_size () {\n>>\n>> filter_git () {\n>> \trm -f rot13-filter.log &&\n>> -\tgit \"$@\" 2>git-stderr.log &&\n>> -\trm -f git-stderr.log\n>> +\tgit \"$@\" 2>/dev/null\n>\n> If I remove the redirection altogether, the test passes for me\n> consistently. The redirection isn't necessary anyway, it looks like a\n> debugging left-over.\n\nOK, then let's have\n\n\tfilter_git () {\n\t\trm -f rot13-filter.log &&\n\t\tgit \"$@\"\n ...\n\nand call that -rc1; to Windows folks, this is sweeping a mysterious\nfailure around git.exe under the rug, but for the purpose of the\noverall project, it is far lower priority to figure out the reason\nwhy a merely-redirected-into file is considered to be delete-pending\non WIndows than have something the end user can start testing and\ncomplaining about new features and regressions.\n\nThanks.\n"},{"id":"305818","messageId":"xmqqr36h209y.fsf@gitster.mtv.corp.google.com","threadId":"44432","inReplyTo":"xmqq1syh3fjx.fsf@gitster.mtv.corp.google.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-11-11T21:07:37Z","receivedAt":"2016-11-11T21:07:46Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> OK, then let's have\n>\n> \tfilter_git () {\n> \t\trm -f rot13-filter.log &&\n> \t\tgit \"$@\"\n> ...\n>\n> and call that -rc1.\n\nThat is, to queue this on top of ls/filter-process and merge it\ndown.\n\n-- >8 --\nSubject: t0021: remove debugging cruft\n\nThe redirection of the standard error stream to a temporary file is\na leftover cruft during debugging. Remove it.\n\nBesides, it is reported by folks on the Windows that the test is\nflaky with this redirection; somebody gets confused and this\nmerely-redirected-to file gets marked as delete-pending by git.exe\nand makes it finish with a non-zero exit status when \"git checkout\"\nfinishes. Windows folks may want to figure that one out, but for\nthe purpose of this test, it shouldn't become a show-stopper.\n\nSigned-off-by: Junio C Hamano \n---\n t/t0021-conversion.sh | 3 +--\n 1 file changed, 1 insertion(+), 2 deletions(-)\n\ndiff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh\nindex cb72fa49de..5ce2535017 100755\n--- a/t/t0021-conversion.sh\n+++ b/t/t0021-conversion.sh\n@@ -27,8 +27,7 @@ file_size () {\n \n filter_git () {\n \trm -f rot13-filter.log &&\n-\tgit \"$@\" 2>git-stderr.log &&\n-\trm -f git-stderr.log\n+\tgit \"$@\"\n }\n \n # Compare two files and ensure that `clean` and `smudge` respectively are\n"},{"id":"305821","messageId":"a90fe336-5b62-4278-64e6-e73cb65a02a8@kdbg.org","threadId":"44432","inReplyTo":"xmqqr36h209y.fsf@gitster.mtv.corp.google.com","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Johannes Sixt","fromEmail":"j6t@kdbg.org","sentAt":"2016-11-11T21:22:45Z","receivedAt":"2016-11-11T21:24:06Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Am 11.11.2016 um 22:07 schrieb Junio C Hamano:\n> Junio C Hamano writes:\n>\n>> OK, then let's have\n>>\n>> \tfilter_git () {\n>> \t\trm -f rot13-filter.log &&\n>> \t\tgit \"$@\"\n>> ...\n>>\n>> and call that -rc1.\n>\n> That is, to queue this on top of ls/filter-process and merge it\n> down.\n>\n> -- >8 --\n> Subject: t0021: remove debugging cruft\n>\n> The redirection of the standard error stream to a temporary file is\n> a leftover cruft during debugging. Remove it.\n>\n> Besides, it is reported by folks on the Windows that the test is\n> flaky with this redirection; somebody gets confused and this\n> merely-redirected-to file gets marked as delete-pending by git.exe\n> and makes it finish with a non-zero exit status when \"git checkout\"\n> finishes. Windows folks may want to figure that one out, but for\n> the purpose of this test, it shouldn't become a show-stopper.\n>\n> Signed-off-by: Junio C Hamano \n\nNicely summarized! Thank you very much!\n\nI've double-checked again that the redirection is really not used by the \ntests. The name does occur in a .gitignore, but I guess that is not \nimportant for the background filter process. It would be good if Lars \ncould confirm this.\n\n> ---\n> t/t0021-conversion.sh | 3 +--\n> 1 file changed, 1 insertion(+), 2 deletions(-)\n>\n> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh\n> index cb72fa49de..5ce2535017 100755\n> --- a/t/t0021-conversion.sh\n> +++ b/t/t0021-conversion.sh\n> @@ -27,8 +27,7 @@ file_size () {\n>\n> filter_git () {\n> \trm -f rot13-filter.log &&\n> -\tgit \"$@\" 2>git-stderr.log &&\n> -\trm -f git-stderr.log\n> +\tgit \"$@\"\n> }\n>\n> # Compare two files and ensure that `clean` and `smudge` respectively are\n>\n\n"},{"id":"305858","messageId":"D8EBCC92-6570-4120-85A8-A9A9CAC74286@gmail.com","threadId":"44432","inReplyTo":"a90fe336-5b62-4278-64e6-e73cb65a02a8@kdbg.org","subject":"Re: 2.11.0-rc1 will not be tagged for a few days","fromName":"Lars Schneider","fromEmail":"larsxschneider@gmail.com","sentAt":"2016-11-12T13:33:29Z","receivedAt":"2016-11-12T13:33:39Z","isPatch":false,"sender":{"key":"larsxschneider@gmail.com","avatar":"https://avatars.githubusercontent.com/u/477434?v=4"},"body":"\n> On 11 Nov 2016, at 22:22, Johannes Sixt wrote:\n> \n> Am 11.11.2016 um 22:07 schrieb Junio C Hamano:\n>> Junio C Hamano writes:\n>> \n>>> OK, then let's have\n>>> \n>>> \tfilter_git () {\n>>> \t\trm -f rot13-filter.log &&\n>>> \t\tgit \"$@\"\n>>> ...\n>>> \n>>> and call that -rc1.\n>> \n>> That is, to queue this on top of ls/filter-process and merge it\n>> down.\n>> \n>> -- >8 --\n>> Subject: t0021: remove debugging cruft\n>> \n>> The redirection of the standard error stream to a temporary file is\n>> a leftover cruft during debugging. Remove it.\n>> \n>> Besides, it is reported by folks on the Windows that the test is\n>> flaky with this redirection; somebody gets confused and this\n>> merely-redirected-to file gets marked as delete-pending by git.exe\n>> and makes it finish with a non-zero exit status when \"git checkout\"\n>> finishes. Windows folks may want to figure that one out, but for\n>> the purpose of this test, it shouldn't become a show-stopper.\n>> \n>> Signed-off-by: Junio C Hamano \n> \n> Nicely summarized! Thank you very much!\n> \n> I've double-checked again that the redirection is really not used by the tests. The name does occur in a .gitignore, but I guess that is not important for the background filter process. It would be good if Lars could confirm this.\n\nYesterday, I wasn't sure if silencing stderr was required by the test.\nJunio's assessment and solution is spot on.\n\nThanks a lot,\nLars\n\n\n> \n>> ---\n>> t/t0021-conversion.sh | 3 +--\n>> 1 file changed, 1 insertion(+), 2 deletions(-)\n>> \n>> diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh\n>> index cb72fa49de..5ce2535017 100755\n>> --- a/t/t0021-conversion.sh\n>> +++ b/t/t0021-conversion.sh\n>> @@ -27,8 +27,7 @@ file_size () {\n>> \n>> filter_git () {\n>> \trm -f rot13-filter.log &&\n>> -\tgit \"$@\" 2>git-stderr.log &&\n>> -\trm -f git-stderr.log\n>> +\tgit \"$@\"\n>> }\n>> \n>> # Compare two files and ensure that `clean` and `smudge` respectively are\n>> \n> \n\n"}]}