# Has the git shell revert been done so master should work? 10 messages from 2008-08-24 to 2008-08-26. Participants: Boyd Lynn Gerber, Jeff King, Junio C Hamano. Thread: https://gitlist.dev/t/15189 ## Boyd Lynn Gerber, 2008-08-24 13:02 Subject: Has the git shell revert been done so master should work? Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.10.0808240659350.16122%40xenau.zenez.com ``` Hello, I just did a clean clone of git git and, I am still seeing failures on all platforms I made work. Has the git shell bug been reverted? What should I do to get this working again on the 12 platforms? Do I need to submit a patch that reverts the patch that caused all this? Thanks, -- Boyd Gerber ZENEZ 1042 East Fort Union #135, Midvale Utah 84047 ``` ## Jeff King, 2008-08-24 17:38 Subject: Re: Has the git shell revert been done so master should work? Message-ID: <20080824173804.GA26626@coredump.intra.peff.net> URL: https://gitlist.dev/e/20080824173804.GA26626%40coredump.intra.peff.net In-Reply-To: ``` On Sun, Aug 24, 2008 at 07:02:38AM -0600, Boyd Lynn Gerber wrote: > I just did a clean clone of git git and, I am still seeing failures on all > platforms I made work. Has the git shell bug been reverted? What should > I do to get this working again on the 12 platforms? Do I need to submit a > patch that reverts the patch that caused all this? It's in 'next' but has not yet graduated to 'master'. You can try cherry-picking 4cfc24af into master. -Peff ``` ## Junio C Hamano, 2008-08-25 00:27 Subject: Re: Has the git shell revert been done so master should work? Message-ID: <7vd4jyj5vg.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vd4jyj5vg.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Boyd Lynn Gerber writes: > I just did a clean clone of git git and, I am still seeing failures on all > platforms I made work. I've been waiting to hear from you for a success/failure report since you were suggested to try the workaround that was queued in 'next' for the first time (I think it was Mike Ralphson on Thu 21st), before moving it to 'master', as platforms with sane linkers do not seem to need it. I see Jeff again suggested you to try cherry-picking the workaround today. Did it work for you? ``` ## Boyd Lynn Gerber, 2008-08-25 05:34 Subject: Re: Has the git shell revert been done so master should work? Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.10.0808242332580.6062%40xenau.zenez.com In-Reply-To: <20080824173804.GA26626@coredump.intra.peff.net> ``` On Sun, 24 Aug 2008, Jeff King wrote: > On Sun, Aug 24, 2008 at 07:02:38AM -0600, Boyd Lynn Gerber wrote: > > I just did a clean clone of git git and, I am still seeing failures on all > > platforms I made work. Has the git shell bug been reverted? What should > > I do to get this working again on the 12 platforms? Do I need to submit a > > patch that reverts the patch that caused all this? > > It's in 'next' but has not yet graduated to 'master'. You can try > cherry-picking 4cfc24af into master. I have never used cherry-pick before. I can not seem to get the right incantation to get this into master to test it. Could someone assist me with how to get this into master for testing? Thanks, -- Boyd Gerber ZENEZ 1042 East Fort Union #135, Midvale Utah 84047 ``` ## Jeff King, 2008-08-25 05:40 Subject: Re: Has the git shell revert been done so master should work? Message-ID: <20080825054021.GA9785@sigill.intra.peff.net> URL: https://gitlist.dev/e/20080825054021.GA9785%40sigill.intra.peff.net In-Reply-To: ``` On Sun, Aug 24, 2008 at 11:34:19PM -0600, Boyd Lynn Gerber wrote: > > It's in 'next' but has not yet graduated to 'master'. You can try > > cherry-picking 4cfc24af into master. > > I have never used cherry-pick before. I can not seem to get the right > incantation to get this into master to test it. Could someone assist me > with how to get this into master for testing? The usual way would be: git checkout master ;# if you are not already there git cherry-pick 4cfc24af However, it looks like Junio has just pushed out a master that has the commit in question. -Peff ``` ## Junio C Hamano, 2008-08-25 05:40 Subject: Re: Has the git shell revert been done so master should work? Message-ID: <7vej4dire6.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vej4dire6.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Boyd Lynn Gerber writes: > On Sun, 24 Aug 2008, Jeff King wrote: >> On Sun, Aug 24, 2008 at 07:02:38AM -0600, Boyd Lynn Gerber wrote: >> > I just did a clean clone of git git and, I am still seeing failures on all >> > platforms I made work. Has the git shell bug been reverted? What should >> > I do to get this working again on the 12 platforms? Do I need to submit a >> > patch that reverts the patch that caused all this? >> >> It's in 'next' but has not yet graduated to 'master'. You can try >> cherry-picking 4cfc24af into master. > > I have never used cherry-pick before. I can not seem to get the right > incantation to get this into master to test it. Could someone assist me > with how to get this into master for testing? For your future reference, it would have been: git checkout master git cherry-pick 4cfc24af But I've already pushed out the 'master' with the workarounds, so it should not be necessary anymore. Please check if tonight's 'master' works for you. Thanks. ``` ## Boyd Lynn Gerber, 2008-08-25 19:30 Subject: Re: Has the git shell revert been done so master should work? Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.10.0808251325540.19079%40suse104.zenez.com In-Reply-To: ``` I was doing it correctly, but this is what I am seeing. $ git clone git://git.kernel.org/pub/scm/git/git.git git $ cd git $ git checkout master Already on "master" $ git cherry-pick 4cfc24af fatal: exec merge-recursive failed. Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add ' or 'git rm ' and commit the result. When commiting, use the option '-c 4cfc24a' to retain authorship and message. So I was attempting to do it right, but it just did not work. BTW, is there a way to get all the messages sent since last night. Some how I lost my subscription to the git email list. I re-subscribe at around 1:30 MDT. I really would like to get all the email I mised. Thanks, -- Boyd Gerber ZENEZ 1042 East Fort Union #135, Midvale Utah 84047 ``` ## Jeff King, 2008-08-25 21:03 Subject: Re: Has the git shell revert been done so master should work? Message-ID: <20080825210351.GB28482@coredump.intra.peff.net> URL: https://gitlist.dev/e/20080825210351.GB28482%40coredump.intra.peff.net In-Reply-To: ``` On Mon, Aug 25, 2008 at 01:30:23PM -0600, Boyd Lynn Gerber wrote: > $ git clone git://git.kernel.org/pub/scm/git/git.git git > $ cd git > $ git checkout master > Already on "master" > $ git cherry-pick 4cfc24af > fatal: exec merge-recursive failed. > Automatic cherry-pick failed. After resolving the conflicts, > mark the corrected paths with 'git add ' or 'git rm ' and > commit the result. > When commiting, use the option '-c 4cfc24a' to retain authorship and > message. > > So I was attempting to do it right, but it just did not work. Hmm. Something is broken if it was unable to run merge-recursive. You could maybe try running with GIT_TRACE=1, or stracing cherry-pick to see what was going on. > BTW, is there a way to get all the messages sent since last night. Some > how I lost my subscription to the git email list. I re-subscribe at > around 1:30 MDT. I really would like to get all the email I mised. Gmane maintains an archive. You can either just read the messages via the web, grab them via nntp, or you can even persuade them to send you an mbox of a set of messages: http://gmane.org/export.php -Peff ``` ## Boyd Lynn Gerber, 2008-08-26 01:28 Subject: Re: Has the git shell revert been done so master should work? Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.10.0808251926081.4792%40suse104.zenez.com In-Reply-To: <20080825210351.GB28482@coredump.intra.peff.net> ``` On Mon, 25 Aug 2008, Jeff King wrote: > Gmane maintains an archive. You can either just read the messages via > the web, grab them via nntp, or you can even persuade them to send you > an mbox of a set of messages: > > http://gmane.org/export.php The latest date I could get is 20 Aug 08. There has to be a way to get just todays. With the high traffice of this list. I really need to get them before to many emails come so I can keep my archive consistent. I really hate reading email via the web. I have a hard time following everything. Thanks, -- Boyd Gerber ZENEZ 1042 East Fort Union #135, Midvale Utah 84047 ``` ## Boyd Lynn Gerber, 2008-08-26 10:03 Subject: Re: Has the git shell revert been done so master should work? Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.10.0808260401280.11123%40suse104.zenez.com In-Reply-To: <7vej4dire6.fsf@gitster.siamese.dyndns.org> ``` On Sun, 24 Aug 2008, Junio C Hamano wrote: > But I've already pushed out the 'master' with the workarounds, so it > should not be necessary anymore. Please check if tonight's 'master' works > for you. This allow 1.6.0 with fixes to compile. I now have to figure out why some tests fail. It seems different tests fail on various platforms but that is an other issue. I will get back to the list with new questions at that time. But this does solve the problems with compiling. Thanks, -- Boyd Gerber ZENEZ 1042 East Fort Union #135, Midvale Utah 84047 ```