From: Ben Jackson <ben@ben.com>
To: Mark Levedahl <mlevedahl@gmail.com>
Cc: Jens Lehmann <Jens.Lehmann@web.de>,
Jonathan Nieder <jrnieder@gmail.com>,
git@vger.kernel.org, Klaus Ethgen <Klaus@Ethgen.de>,
Sven Verdoolaege <skimo@kotnet.org>
Subject: Re: [RFC/PATCH] Re: git submodule -b ... of current HEAD fails
Date: Thu, 2 Dec 2010 17:21:56 -0800 [thread overview]
Message-ID: <20101203012155.GA30999@kronos.home.ben.com> (raw)
In-Reply-To: <4CF844E5.5010808@gmail.com>
On Thu, Dec 02, 2010 at 08:16:21PM -0500, Mark Levedahl wrote:
> On 12/02/2010 04:11 PM, Jens Lehmann wrote:
> > Nope, these lines date back to the time before I got involved in the
> > submodule business ... Seems like this "git checkout" was added in
> > March 2008 by Mark Levedahl (CCed), maybe he can shed some light on
> > that.
> >
> > But to me your change looks good, so feel free to add:
> > Acked-by: Jens Lehmann<Jens.Lehmann@web.de>
> >
> >
> >> diff --git a/git-submodule.sh b/git-submodule.sh
> >> index 33bc41f..6242d7f 100755
> >> --- a/git-submodule.sh
> >> +++ b/git-submodule.sh
> >> @@ -241,7 +241,7 @@ cmd_add()
> >> # ash fails to wordsplit ${branch:+-b "$branch"...}
> >> case "$branch" in
> >> '') git checkout -f -q ;;
> >> - ?*) git checkout -f -q -b "$branch" "origin/$branch" ;;
> >> + ?*) git checkout -f -q -B "$branch" "origin/$branch" ;;
> >> esac
> >> ) || die "Unable to checkout submodule '$path'"
> >> fi
> >>
> These lines were actually added by Ben Jackson in commit ea10b60c91 in
> 2009, long after I last touched that module.
I didn't mean to change any functionality -- I just wanted to fix a
portability problem (/bin/sh is ash on FreeBSD, hence the comment at the
top of the context). Looks like `checkout -B' (capital B) didn't even
exist at that time. Seems reasonable, though.
--
Ben Jackson AD7GD
<ben@ben.com>
http://www.ben.com/
next prev parent reply other threads:[~2010-12-03 1:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20101201171814.GC6439@ikki.ethgen.de>
2010-12-01 18:50 ` [RFC/PATCH] Re: git submodule -b ... of current HEAD fails Jonathan Nieder
2010-12-02 21:11 ` Jens Lehmann
2010-12-03 1:16 ` Mark Levedahl
2010-12-03 1:21 ` Ben Jackson [this message]
2010-12-03 7:10 ` Jonathan Nieder
2010-12-04 23:27 ` [PATCH] git submodule: Remove now obsolete tests before cloning a repo Jens Lehmann
2010-12-07 22:57 ` [RFC/PATCH] Re: git submodule -b ... of current HEAD fails Junio C Hamano
2010-12-08 21:35 ` Jens Lehmann
2010-12-08 23:19 ` [PATCH] " Jens Lehmann
2010-12-08 23:45 ` Jonathan Nieder
2010-12-28 21:42 ` [RFC/PATCH] " Junio C Hamano
2010-12-29 0:05 ` Jens Lehmann
2010-12-29 0:34 ` Junio C Hamano
2010-12-29 9:04 ` Jens Lehmann
2010-12-29 20:53 ` Re* " Junio C Hamano
[not found] ` <4D1BB26D.1010502@web.de>
2010-12-29 22:23 ` Jens Lehmann
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=20101203012155.GA30999@kronos.home.ben.com \
--to=ben@ben.com \
--cc=Jens.Lehmann@web.de \
--cc=Klaus@Ethgen.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=mlevedahl@gmail.com \
--cc=skimo@kotnet.org \
/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).