git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@vyatta.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: skimo@liacs.nl, skimo@kotnet.org,
	Linus Torvalds <torvalds@linux-foundation.org>,
	git@vger.kernel.org
Subject: Re: Submodules and rewind
Date: Tue, 19 Feb 2008 17:13:01 -0800	[thread overview]
Message-ID: <20080219171301.53893f2c@extreme> (raw)
In-Reply-To: <alpine.LSU.1.00.0802200203440.8333@wbgn129.biozentrum.uni-wuerzburg.de>

On Wed, 20 Feb 2008 02:06:36 +0100 (CET)
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

> Hi,
> 
> On Tue, 19 Feb 2008, Stephen Hemminger wrote:
> 
> > On Wed, 20 Feb 2008 00:35:33 +0100 (CET)
> > Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > 
> > > On Tue, 19 Feb 2008, Stephen Hemminger wrote:
> > > 
> > > > On Tue, 19 Feb 2008 23:32:01 +0100
> > > > Sven Verdoolaege <skimo@kotnet.org> wrote:
> > > > 
> > > > > On Tue, Feb 19, 2008 at 02:06:04PM -0800, Stephen Hemminger wrote:
> > > > > > Because of a bone headed merge, I had to rewind one project back 
> > > > > > to a known good state, but the sub module stuff is now wedged 
> > > > > > and brain stuck on the old commit id.
> > > > > > 
> > > > > > Isn't there some simple way to do 'git sub-module remove' 
> > > > > > followed by 'git sub-module add' to reset the internal index?
> > > > > 
> > > > > Why doesn't "git submodule update" work for you?
> > > > > 
> > > > 
> > > > It didn't fix it, but recloning did.
> > > 
> > > That does not make sense.  But with your reluctance with regards to 
> > > revealing details, it is really impossible to tell what is going on.
> > > 
> > > For example, you did not even once give us the output of "git 
> > > submodule", let alone "git diff <submodule>".
> > > 
> > > Helpless,
> > > Dscho
> > 
> > Don't be stupid,
> 
> Thanks, I'm trying, I'm trying.
> 
> BTW that "Helpless" was meant as "I cannot help you".
> 
> > $ git-submodule init
> > Submodule 'pkgs/linux-image-2.6.23-1-486-vyatta' (http://git.vyatta.com/linux-vyatta.git) registered for path 'pkgs/linux-image-2.6.23-1-486-vyatta'
> 
> AFAICT this is your problem.  Your urls are http:// url, and do not end in 
> a slash.
> 
> Yes, there was a fix recently, but apparently it was not enough.  With 
> the slash, it should even work on older git.
> 

That is a different issue.  It worked before my messing around with the vyatta-iproute.git
repository.

  reply	other threads:[~2008-02-20  1:13 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-19 22:06 Submodules and rewind Stephen Hemminger
2008-02-19 22:32 ` Sven Verdoolaege
2008-02-19 23:23   ` Stephen Hemminger
2008-02-19 23:35     ` Johannes Schindelin
2008-02-20  0:15       ` Stephen Hemminger
2008-02-20  0:47         ` Linus Torvalds
2008-02-20  0:52           ` Stephen Hemminger
2008-02-20  1:06         ` Johannes Schindelin
2008-02-20  1:13           ` Stephen Hemminger [this message]
2008-02-20  1:22             ` Johannes Schindelin
2008-02-20  2:25               ` Stephen Hemminger

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=20080219171301.53893f2c@extreme \
    --to=shemminger@vyatta.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=skimo@kotnet.org \
    --cc=skimo@liacs.nl \
    --cc=torvalds@linux-foundation.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).