Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] git feedback

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Jeremy Blosser <jblosser-smgl AT firinn.org>
  • To: SM-Discuss <sm-discuss AT lists.ibiblio.org>
  • Subject: Re: [SM-Discuss] git feedback
  • Date: Tue, 25 Jul 2006 18:27:20 -0500

On Jul 25, Eric Sandall [eric AT sandall.us] wrote:
> Arwed von Merkatz wrote:
> > Hi everyone,
> >
> > we've all been using git for some time now, and I'd like to get a little
> > feedback. Not so much about specific issues, though you are welcome to
> > ask about them anyway ;), but more some general feeling like "if we have
> > to use git, I'll leave smgl development" or "git will lead to world
> > peace". Technically I think it can do everything we need it to do,
> > though it'll probably need a few wrapper scripts to make some use-cases
> > easier.
>
> I'm using `git clone -s` to setup my /var/lib/sorcery/codex from my git
> clones of our grimoires. When I work on spells I tend to update them in
> /var/lib/sorcery/codex to see if they work before bothering with git
> (since in order for /var/lib/sorcery/codex to see my updates I'd have to
> commit the changes). Now and then, after playing with
> /var/lib/sorcery/codex and then updating my original git clones, when I
> try to update my /var/lib/sorcery/codex clones I receive this:

If you're actually going to make changes to it like that you might want to
just make it a regular clone of your local working repository instead of a
shared clone. I'm not entirely sure what the expected behaviour is when
you're sharing objects and make the trees diverge on purpose.

> $ git checkout -f
> $ git fetch
> Generating pack...
> Done counting 133 objects.
> Result has 90 objects.
> Deltifying 90 objects.
> Unpacking 90 objects
> 100% (90/90) done
> 100% (90/90) done
> Total 90, written 90 (delta 50), reused 1 (delta 0)
> * refs/heads/origin: does not fast forward to branch 'master' of
> /home/sandalle/scm/git/smgl/grimoire/;
> not updating.
>
> The only way I have found (git reset --hard doesn't help) to 'fix' this
> is to remove my /var/lib/sorcery/codex directory and re-clone it.
>
> -sandalle

Attachment: pgpB0giK03qHg.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page