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: Eric Sandall <eric AT sandall.us>
  • To: SM-Discuss <sm-discuss AT lists.ibiblio.org>
  • Subject: Re: [SM-Discuss] git feedback
  • Date: Tue, 25 Jul 2006 16:01:53 -0700

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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:

$ 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

- --
Eric Sandall | Source Mage GNU/Linux Developer
eric AT sandall.us | http://www.sourcemage.org/
http://eric.sandall.us/ | SysAdmin @ Shock Physics @ WSU
http://counter.li.org/ #196285 | http://www.shock.wsu.edu/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFExqLhHXt9dKjv3WERArVbAKC3kVwslf75DoDPOYisYvUXBXtXsACfWCg2
6BzqeiCY626SZNQChscz90Y=
=MLJZ
-----END PGP SIGNATURE-----




Archive powered by MHonArc 2.6.24.

Top of Page