From: Daniel Barkalow <barkalow@iabervon.org>
Date: Fri, 17 Jun 2005 22:10:24 GMT
Subject: Re: Stacked GIT 0.1 (a.k.a. quilt for git)
Message-ID: <Pine.LNX.4.21.0506171750180.30848-100000@iabervon.org>
In-Reply-To: <tnxy899zzu7.fsf@arm.com>

On Thu, 16 Jun 2005, Catalin Marinas wrote:

> StGIT is a Python application providing similar functionality to quilt
> (i.e. pushing/poping patches to a stack) on top of git.

It might be worth making the system work for having multiple series in the
same tree. You could do this by saving the base commit for
.git/refs/heads/<name> as .git/refs/bases/<name>, and putting patches in
.git/patches/<name>/. Some people do a lot with
.git/refs/heads/something; I, at least, symlink .git/HEAD to whichever one
I'm using, so that might be the right way to tell what the user is doing.

I think it would worth exploring defining a git type for patches and
storing the patches inside git as well. Then a commit could identify the
patch it applies (when it is from applying a patch), and a rebased patch
could reference the patch it replaces, and then (with a certain amount of
handwaving of implementation) the system could notice when the patch
you're pushing got applied upstream. Or, at least, git could avoid 
throwing away the history information when it goes through patches. I keep
thinking that this would be an important feature, but I haven't got the
familiarity with quilt to know how it should work.

	-Daniel
*This .sig left intentionally blank*