Re: git pull for update of netdev fails.

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sep 25, 2006, 12:47 UTC
Message-ID: <b0943d9e0609250547j472ff0c0j876987663cfb1490@mail.gmail.com>
In-Reply-To: <20060924205455.GA20017@pasky.or.cz>

On 24/09/06, Petr Baudis <pasky@suse.cz> wrote:

Show 11 quoted lines

> 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 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:

Yes, indeed (I'm still tired :-)). The patch changes are safe and one could probably generate the patch from them but it's a bit more complicated. The quick solution is to add another parent to the changelog commit so that it points to the patch. However, this wouldn't look as nice with gitk as it sees them as merges and doesn't display the diff (is there an option I missed?).

-- 
Catalin