{"thread":{"id":"15189","subject":"Has the git shell revert been done so master should work?","startedAt":"2008-08-24T13:02:38Z","lastAt":"2008-08-26T10:03:57Z","messageCount":10,"participants":["Boyd Lynn Gerber","Jeff King","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"88360","messageId":"alpine.LNX.1.10.0808240659350.16122@xenau.zenez.com","threadId":"15189","inReplyTo":null,"subject":"Has the git shell revert been done so master should work?","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-08-24T13:02:38Z","receivedAt":"2008-08-24T13:02:38Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"Hello,\n\nI just did a clean clone of git git and, I am still seeing failures on all \nplatforms I made work. Has the git shell bug been reverted? What should \nI do to get this working again on the 12 platforms? Do I need to submit a \npatch that reverts the patch that caused all this?\n\nThanks,\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"},{"id":"88371","messageId":"20080824173804.GA26626@coredump.intra.peff.net","threadId":"15189","inReplyTo":"alpine.LNX.1.10.0808240659350.16122@xenau.zenez.com","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-08-24T17:38:04Z","receivedAt":"2008-08-24T17:38:04Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Aug 24, 2008 at 07:02:38AM -0600, Boyd Lynn Gerber wrote:\n\n> I just did a clean clone of git git and, I am still seeing failures on all \n> platforms I made work. Has the git shell bug been reverted? What should \n> I do to get this working again on the 12 platforms? Do I need to submit a \n> patch that reverts the patch that caused all this?\n\nIt's in 'next' but has not yet graduated to 'master'. You can try\ncherry-picking 4cfc24af into master.\n\n-Peff\n"},{"id":"88410","messageId":"7vd4jyj5vg.fsf@gitster.siamese.dyndns.org","threadId":"15189","inReplyTo":"alpine.LNX.1.10.0808240659350.16122@xenau.zenez.com","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-25T00:27:47Z","receivedAt":"2008-08-25T00:27:47Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Boyd Lynn Gerber writes:\n\n> I just did a clean clone of git git and, I am still seeing failures on all \n> platforms I made work.\n\nI've been waiting to hear from you for a success/failure report since you\nwere suggested to try the workaround that was queued in 'next' for the\nfirst time (I think it was Mike Ralphson on Thu 21st), before moving it to\n'master', as platforms with sane linkers do not seem to need it.\n\nI see Jeff again suggested you to try cherry-picking the workaround today.\nDid it work for you?\n"},{"id":"88429","messageId":"alpine.LNX.1.10.0808242332580.6062@xenau.zenez.com","threadId":"15189","inReplyTo":"20080824173804.GA26626@coredump.intra.peff.net","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-08-25T05:34:19Z","receivedAt":"2008-08-25T05:34:19Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"On Sun, 24 Aug 2008, Jeff King wrote:\n> On Sun, Aug 24, 2008 at 07:02:38AM -0600, Boyd Lynn Gerber wrote:\n> > I just did a clean clone of git git and, I am still seeing failures on all \n> > platforms I made work. Has the git shell bug been reverted? What should \n> > I do to get this working again on the 12 platforms? Do I need to submit a \n> > patch that reverts the patch that caused all this?\n> \n> It's in 'next' but has not yet graduated to 'master'. You can try\n> cherry-picking 4cfc24af into master.\n\nI have never used cherry-pick before. I can not seem to get the right \nincantation to get this into master to test it. Could someone assist me \nwith how to get this into master for testing?\n\nThanks,\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"},{"id":"88430","messageId":"20080825054021.GA9785@sigill.intra.peff.net","threadId":"15189","inReplyTo":"alpine.LNX.1.10.0808242332580.6062@xenau.zenez.com","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-08-25T05:40:21Z","receivedAt":"2008-08-25T05:40:21Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Aug 24, 2008 at 11:34:19PM -0600, Boyd Lynn Gerber wrote:\n\n> > It's in 'next' but has not yet graduated to 'master'. You can try\n> > cherry-picking 4cfc24af into master.\n> \n> I have never used cherry-pick before. I can not seem to get the right \n> incantation to get this into master to test it. Could someone assist me \n> with how to get this into master for testing?\n\nThe usual way would be:\n\n git checkout master ;# if you are not already there\n git cherry-pick 4cfc24af\n\nHowever, it looks like Junio has just pushed out a master that has the\ncommit in question.\n\n-Peff\n"},{"id":"88431","messageId":"7vej4dire6.fsf@gitster.siamese.dyndns.org","threadId":"15189","inReplyTo":"alpine.LNX.1.10.0808242332580.6062@xenau.zenez.com","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-25T05:40:33Z","receivedAt":"2008-08-25T05:40:33Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Boyd Lynn Gerber writes:\n\n> On Sun, 24 Aug 2008, Jeff King wrote:\n>> On Sun, Aug 24, 2008 at 07:02:38AM -0600, Boyd Lynn Gerber wrote:\n>> > I just did a clean clone of git git and, I am still seeing failures on all \n>> > platforms I made work. Has the git shell bug been reverted? What should \n>> > I do to get this working again on the 12 platforms? Do I need to submit a \n>> > patch that reverts the patch that caused all this?\n>> \n>> It's in 'next' but has not yet graduated to 'master'. You can try\n>> cherry-picking 4cfc24af into master.\n>\n> I have never used cherry-pick before. I can not seem to get the right \n> incantation to get this into master to test it. Could someone assist me \n> with how to get this into master for testing?\n\nFor your future reference, it would have been:\n\n\tgit checkout master\n\tgit cherry-pick 4cfc24af\n\nBut I've already pushed out the 'master' with the workarounds, so it\nshould not be necessary anymore. Please check if tonight's 'master' works\nfor you.\n\nThanks.\n"},{"id":"88492","messageId":"alpine.LNX.1.10.0808251325540.19079@suse104.zenez.com","threadId":"15189","inReplyTo":"alpine.LNX.1.10.0808240659350.16122@xenau.zenez.com","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-08-25T19:30:23Z","receivedAt":"2008-08-25T19:30:23Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"I was doing it correctly, but this is what I am seeing.\n\n$ git clone git://git.kernel.org/pub/scm/git/git.git git\n$ cd git\n$ git checkout master\nAlready on \"master\"\n$ git cherry-pick 4cfc24af\nfatal: exec merge-recursive failed.\nAutomatic cherry-pick failed. After resolving the conflicts,\nmark the corrected paths with 'git add ' or 'git rm ' and \ncommit the result.\nWhen commiting, use the option '-c 4cfc24a' to retain authorship and \nmessage.\n\nSo I was attempting to do it right, but it just did not work.\n\nBTW, is there a way to get all the messages sent since last night. Some \nhow I lost my subscription to the git email list. I re-subscribe at \naround 1:30 MDT. I really would like to get all the email I mised.\n\nThanks,\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"},{"id":"88509","messageId":"20080825210351.GB28482@coredump.intra.peff.net","threadId":"15189","inReplyTo":"alpine.LNX.1.10.0808251325540.19079@suse104.zenez.com","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2008-08-25T21:03:51Z","receivedAt":"2008-08-25T21:03:51Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Aug 25, 2008 at 01:30:23PM -0600, Boyd Lynn Gerber wrote:\n\n> $ git clone git://git.kernel.org/pub/scm/git/git.git git\n> $ cd git\n> $ git checkout master\n> Already on \"master\"\n> $ git cherry-pick 4cfc24af\n> fatal: exec merge-recursive failed.\n> Automatic cherry-pick failed. After resolving the conflicts,\n> mark the corrected paths with 'git add ' or 'git rm ' and \n> commit the result.\n> When commiting, use the option '-c 4cfc24a' to retain authorship and \n> message.\n>\n> So I was attempting to do it right, but it just did not work.\n\nHmm. Something is broken if it was unable to run merge-recursive. You\ncould maybe try running with GIT_TRACE=1, or stracing cherry-pick to see\nwhat was going on.\n\n> BTW, is there a way to get all the messages sent since last night. Some \n> how I lost my subscription to the git email list. I re-subscribe at \n> around 1:30 MDT. I really would like to get all the email I mised.\n\nGmane maintains an archive. You can either just read the messages via\nthe web, grab them via nntp, or you can even persuade them to send you\nan mbox of a set of messages:\n\n http://gmane.org/export.php\n\n-Peff\n"},{"id":"88532","messageId":"alpine.LNX.1.10.0808251926081.4792@suse104.zenez.com","threadId":"15189","inReplyTo":"20080825210351.GB28482@coredump.intra.peff.net","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-08-26T01:28:33Z","receivedAt":"2008-08-26T01:28:33Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"On Mon, 25 Aug 2008, Jeff King wrote:\n> Gmane maintains an archive. You can either just read the messages via\n> the web, grab them via nntp, or you can even persuade them to send you\n> an mbox of a set of messages:\n>\n> http://gmane.org/export.php\n\nThe latest date I could get is 20 Aug 08. There has to be a way to get \njust todays. With the high traffice of this list. I really need to get \nthem before to many emails come so I can keep my archive consistent.\n\nI really hate reading email via the web. I have a hard time following \neverything.\n\nThanks,\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"},{"id":"88562","messageId":"alpine.LNX.1.10.0808260401280.11123@suse104.zenez.com","threadId":"15189","inReplyTo":"7vej4dire6.fsf@gitster.siamese.dyndns.org","subject":"Re: Has the git shell revert been done so master should work?","fromName":"Boyd Lynn Gerber","fromEmail":"gerberb@zenez.com","sentAt":"2008-08-26T10:03:57Z","receivedAt":"2008-08-26T10:03:57Z","isPatch":false,"sender":{"key":"gerberb@zenez.com","avatar":null},"body":"On Sun, 24 Aug 2008, Junio C Hamano wrote:\n> But I've already pushed out the 'master' with the workarounds, so it\n> should not be necessary anymore. Please check if tonight's 'master' works\n> for you.\n\nThis allow 1.6.0 with fixes to compile. I now have to figure out why some \ntests fail. It seems different tests fail on various platforms but that \nis an other issue. I will get back to the list with new questions at that \ntime. But this does solve the problems with compiling.\n\nThanks,\n\n--\nBoyd Gerber \nZENEZ\t1042 East Fort Union #135, Midvale Utah 84047\n"}]}