Re: making stgit handle being rebased by git rebase
- From
Karl Wiberg <kha@treskal.com>
- Date
- Nov 11, 2010, 10:29 UTC
- Message-ID
- <AANLkTik_dFsaiDkugrpBp8T31zNWVMRNC=hQBj0RmV+o@mail.gmail.com>
- In-Reply-To
- <AANLkTik3MVNW0svJEo5gWq3+qGo6dKeqAUz9NPcJnYNN@mail.gmail.com>
On Mon, Nov 8, 2010 at 11:39 PM, Chris Packham <judge.packham@gmail.com> wrote:
> Has anyone looked at making stgit interact with git-rebase more gracefully?
The problem is that StGit's metadata gets out of date when you do a git rebase. A solution would either have to change StGit's metadata representation so that it can't get out of date, or be a fancy version of repair/uncommit that can actually figure out what git did.
I've thought a bit about this in the past, and the best solution I could come up with is of the first kind, and would change the representation of applied patches to use just two refs: the branch itself, and the stack base ref. I think git rebase wouldn't wreck things for that representation.
This kind of change is a lot of work, though, more than I have time for at the moment. And it's not like I have the details worked out or anything... Making stg repair more intelligent would be a lot less involved.
-- Karl Wiberg, kha@treskal.com subrabbit.wordpress.com www.treskal.com/kalle