Re: git pull for update of netdev fails.

From: Petr Baudis <pasky@suse.cz>
Date: Sep 24, 2006, 20:54 UTC
Message-ID: <20060924205455.GA20017@pasky.or.cz>
In-Reply-To: <b0943d9e0609230610h46ffb995gb25ebda8332570e8@mail.gmail.com>

Dear diary, on Sat, Sep 23, 2006 at 03:10:17PM CEST, I got a letter where Catalin Marinas <catalin.marinas@gmail.com> said that...

> (I'm slow at replying and even slower at implementing anything over
> the next 2-3 weeks - paternity leave :-))

Congratulations! :-)

Show 5 quoted lines

> I wasn't following this thread (well, any thread in the last days) but
> the current patch history implementation in StGIT is prune-safe as it
> generates additional commits to keep the history. If you undo an
> operation (push, refresh), the undo will be recorded in the patch
> history (that's really immutable)

It does not directly reference the history in the additional commits though, it just mentions the sha1 in the log message - that is not prune-safe:

$ cg-log -r patches/master/configchanges.log ...pick one at random... commit 4e1ad4b1bfb9488636f1a43b3f3d4b8c3b4b2927 tree 4ba8253dff8190e75ad0f46deaef54747c4ad76d parent 3d5f3a87134a056a52dc21bcc4b1c64a4eef9443 author pasky <pasky@rover.(none)> Tue, 19 Sep 2006 16:47:42 +0200 committer pasky <pasky@rover.(none)> Tue, 19 Sep 2006 16:47:42 +0200

    * Makefile:

    refresh     4852cc3fe638b332f4106b31a7abfafb2c6c3dfc
$ git-fsck-objects --unreachable | grep
4852cc3fe638b332f4106b31a7abfafb2c6c3dfc
unreachable commit 4852cc3fe638b332f4106b31a7abfafb2c6c3dfc

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)