trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: December 2012

Re: [trinity-devel] GIT change

From: Slávek Banko <slavek.banko@...>
Date: Sun, 9 Dec 2012 02:15:01 +0100
On Sunday 09 of December 2012 00:36:13 Timothy Pearson wrote:
> >>Developers, please delete and re-download the top-level GIT
> >
> > supermodule.
> >
> >>I have temporarily locked out commit access to that top level
> >
> > supermodule
> >
> >>to prevent accidental merges of the old history.  All other GIT
> >
> > modules
> >
> >>continue to have normal read/write permissions for the TDE
> >
> > development
> >
> >>team, so the impact of this should be minimal.
> >
> > Supermodule? Delete exactly what directory in the tree?
> >
> > Darrell
>
> The easiest way I have found to do this is:
> cd tde
> mv .git .git.bkp
> git clone http://scm.trinitydesktop.org/scm/git/tde
> mv tde/.git .
> rm -rf tde
> cp -Rp .git.bkp/config .git/config
> rm -rf .git.bkp
> git reset --hard HEAD
> git pull
> git submodule init
> git submodule update
>
> Tim
>

Newer versions of GIT store git folders for submodules to .git/modules at the 
top level .git folder. In this procedure would have been destroyed.

I may have a simpler procedure:

  git pull --rebase

Hereby is performed move to the current HEAD == move to new HEAD of newly 
created repository.

Slavek
--