Oh yea I figured this out. You can just force your way in.
-Charlie
________________________________
From: Charles Lin <clin92.ucsd.edu>
Sent: Thursday, June 21, 2018 4:37:50 PM
To: AMBER Developers Mailing List
Subject: Re: [AMBER-Developers] I don't want to change these files... really!
Hey everyone,
Sorry for ressurecting an older threadI was wondering how you guys fixed this problem in the past? I tried some of the solutions I saw in here. This was a fresh pull and I was trying to access an older branch...
charlie.login:~/amber-gitosis $ git pull
Enter passphrase for key '/server-home1/charlie/.ssh/id_dsa':
Already up-to-date.
charlie.login:~/amber-gitosis $ git submodule --deinit AmberTools/src/cphstats
Usage: git submodule [--quiet] add [-b branch] [-f|--force] [--reference <repository>] [--] <repository> [<path>]
or: git submodule [--quiet] status [--cached] [--recursive] [--] [<path>...]
or: git submodule [--quiet] init [--] [<path>...]
or: git submodule [--quiet] update [--init] [-N|--no-fetch] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...]
or: git submodule [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
or: git submodule [--quiet] foreach [--recursive] <command>
or: git submodule [--quiet] sync [--] [<path>...]
charlie.login:~/amber-gitosis $ git submodule update --init
No submodule mapping found in .gitmodules for path 'AmberTools/src/cphstats/cmake'
charlie.login:~/amber-gitosis $ git checkout midpoint-barostat-merge
error: Updating 'AmberTools/src/cphstats' would lose untracked files in it
charlie.login:~/amber-gitosis $ git status
# On branch master
charlie.login:~/amber-gitosis/AmberTools/src/cphstats $ git status -u
# On branch master
nothing to commit (working directory clean)
charlie.login:~/amber-gitosis/AmberTools/src/cphstats $ git clean -fxd
charlie.login:~/amber-gitosis/AmberTools/src/cphstats $ git checkout midpoint-barostat-merge
error: Updating 'AmberTools/src/cphstats' would lose untracked files in it
This is gitosis as I'm trying to move one of my older branches to the new gitlab.
Thanks,
Charlie
________________________________
From: David Cerutti <dscerutti.gmail.com>
Sent: Thursday, September 21, 2017 2:46:57 AM
To: AMBER Developers Mailing List
Subject: Re: [AMBER-Developers] I don't want to change these files... really!
Good to hear, thanks for checking Hai! Haven't gotten any complaints about
the compilation or the function of pmemd either, so fingers crossed...
On Thu, Sep 21, 2017 at 1:20 AM, Hai Nguyen <nhai.qn.gmail.com> wrote:
> On Wed, Sep 20, 2017 at 3:19 PM, David Cerutti <dscerutti.gmail.com>
> wrote:
>
> > I tried that, still got "fatal..." messages about the url. So, I just
> did
> > git rm, which also complained that it wasn't in .gitmodules but got rid
> of
> > it nonetheless. I was then able to do apply Hai's suggestion,
> >
> > git submodule foreach git clean -fdx .
> > git submodule foreach git checkout .
> >
> > and, finally, the coup de grace, git submodule update --init. I now
> have a
> > clean board...
> >
> > On branch master
> > Your branch is ahead of 'origin/master' by 60 commits.
> > (use "git push" to publish your local commits)
> > Untracked files:
> > ...
> >
> >
>
> > Test cases are passing. Brace yourselves, I'm pushing changes to
> master...
> >
> >
> As far I can tell you did not break AT test:
> https://travis-ci.org/hainm/ambertools-binary-test/builds/278002592
>
> Hai
>
>
> > Dave
> >
> >
> > On Wed, Sep 20, 2017 at 3:07 PM, Jason Swails <jason.swails.gmail.com>
> > wrote:
> >
> > > On Wed, Sep 20, 2017 at 3:02 PM, Daniel Roe <daniel.r.roe.gmail.com>
> > > wrote:
> > >
> > > >
> > > > git submodule --deinit AmberTools/src/build-bot/ambertools-test
> > > >
> > > > Then pull and do another 'submodule update --init'. If it's supposed
> > > > to be there it should come back.
> > > >
> > >
> > >
> > > ^^^^ This is exactly what I was going to suggest.
> > >
> > >
> > > --
> > > Jason M. Swails
> > > _______________________________________________
> > > AMBER-Developers mailing list
> > > AMBER-Developers.ambermd.org
> > > http://lists.ambermd.org/mailman/listinfo/amber-developers
> > >
> > _______________________________________________
> > AMBER-Developers mailing list
> > AMBER-Developers.ambermd.org
> > http://lists.ambermd.org/mailman/listinfo/amber-developers
> >
> _______________________________________________
> AMBER-Developers mailing list
> AMBER-Developers.ambermd.org
> http://lists.ambermd.org/mailman/listinfo/amber-developers
>
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Fri Jun 22 2018 - 08:30:04 PDT
