Re: Problem switching branches in submodule

2013-09-26 Thread Duy Nguyen
On Fri, Sep 27, 2013 at 12:20 AM, Manish Gill wrote: > Hello, > > I have a git repository with lots of submodules. In one particular > submodule, I'm having the following problem: > > If I try to switch branches at the top-level of that submodule, I succeed. > > But, if I try to switch branches in

Re: Problem switching branches in submodule

2013-09-26 Thread Manish Gill
On 09/27/2013 12:18 AM, Jonathan Nieder wrote: > Manish Gill wrote: >> Jonathan Nieder wrote: > >>> What is the exact command you use to get the above output? >> >> git checkout > > Is a normal branch, a remote-tracking branch, or a > branch that doesn't exist yet? Local branch that was suppos

Re: Problem switching branches in submodule

2013-09-26 Thread Jonathan Nieder
Manish Gill wrote: > Jonathan Nieder wrote: >> What is the exact command you use to get the above output? > > git checkout Is a normal branch, a remote-tracking branch, or a branch that doesn't exist yet? [...] > I should mention what *exactly* happened that led to this. I was trying > to publ

Re: Problem switching branches in submodule

2013-09-26 Thread Manish Gill
On 09/26/2013 11:38 PM, Jonathan Nieder wrote: > (cc-ing Duy, who knows the setup code well) > Manish Gill wrote: > >> I have a git repository with lots of submodules. In one particular >> submodule, I'm having the following problem: >> >> If I try to switch branches at the top-level of that submo

Re: Problem switching branches in submodule

2013-09-26 Thread Jonathan Nieder
(cc-ing Duy, who knows the setup code well) Manish Gill wrote: > I have a git repository with lots of submodules. In one particular > submodule, I'm having the following problem: > > If I try to switch branches at the top-level of that submodule, I succeed. > > But, if I try to switch branches in

Problem switching branches in submodule

2013-09-26 Thread Manish Gill
Hello, I have a git repository with lots of submodules. In one particular submodule, I'm having the following problem: If I try to switch branches at the top-level of that submodule, I succeed. But, if I try to switch branches in any subsequen levels, I get the following error: fatal: inter

Re: problem switching branches

2013-03-01 Thread J.V.
On 2/26/2013 10:17 PM, Jeff King wrote: On Tue, Feb 26, 2013 at 04:08:55PM -0700, J.V. wrote: I was on my master branch, I then checked out a branch ( origin/somebranch ), made no updates but did a few git pulls on the branch over about a week; then made a small change to only a single file & c

Re: problem switching branches

2013-02-26 Thread Jeff King
On Tue, Feb 26, 2013 at 04:08:55PM -0700, J.V. wrote: > I was on my master branch, I then checked out a branch ( > origin/somebranch ), made no updates > but did a few git pulls on the branch over about a week; then made a > small change to only a single file & committed & pushed. > > Now am tryi

problem switching branches

2013-02-26 Thread J.V.
I was on my master branch, I then checked out a branch ( origin/somebranch ), made no updates but did a few git pulls on the branch over about a week; then made a small change to only a single file & committed & pushed. Now am trying to go back to my master branch and get: error: The following