Re: Submodules and rewind

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

> Hi,
> 
> On Tue, 19 Feb 2008, Stephen Hemminger wrote:
> 
> > On Wed, 20 Feb 2008 00:35:33 +0100 (CET)
> > Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
> > 
> > > On Tue, 19 Feb 2008, Stephen Hemminger wrote:
> > > 
> > > > On Tue, 19 Feb 2008 23:32:01 +0100
> > > > Sven Verdoolaege <skimo@xxxxxxxxxx> 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.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux