git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Boyd Lynn Gerber <gerberb@zenez.com>
Cc: Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>
Subject: Re: Has the git shell revert been done so master should work?
Date: Sun, 24 Aug 2008 22:40:33 -0700	[thread overview]
Message-ID: <7vej4dire6.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LNX.1.10.0808242332580.6062@xenau.zenez.com> (Boyd Lynn Gerber's message of "Sun, 24 Aug 2008 23:34:19 -0600")

Boyd Lynn Gerber <gerberb@zenez.com> 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.

  parent reply	other threads:[~2008-08-25  5:41 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-24 13:02 Has the git shell revert been done so master should work? Boyd Lynn Gerber
2008-08-24 17:38 ` Jeff King
2008-08-25  5:34   ` Boyd Lynn Gerber
2008-08-25  5:40     ` Jeff King
2008-08-25  5:40     ` Junio C Hamano [this message]
2008-08-26 10:03       ` Boyd Lynn Gerber
2008-08-25  0:27 ` Junio C Hamano
2008-08-25 19:30 ` Boyd Lynn Gerber
2008-08-25 21:03   ` Jeff King
2008-08-26  1:28     ` Boyd Lynn Gerber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vej4dire6.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=gerberb@zenez.com \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).