Re: Editing the root commit

From: Chris Webb <chris@arachsys.com>
Date: Jun 26, 2012, 13:33 UTC
Message-ID: <20120626133339.GT9682@arachsys.com>
In-Reply-To: <20120620194824.GA32228@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> I think the only thing you can do is make a fake sentinel commit (with
> an empty tree) to put in HEAD, and then remove the sentinel immediately
> after the first commit is put in place (making sure not to include it in
> the first commit's parent list). Yuck.

I thought this would turn out far more horrible than it actually did in practice.

The follow-up patch adds this empty sentinel and then automatically squashes it into the root commit(s) as they're picked. The resulting rebase -i --root can handle re-ordering of commits (picking a new root), editing of the root commit, dropping the root commit, and so on.

In the second patch, I've written some simple tests to demonstrate this and to cover cases that seem particularly likely to break, as well as removing a test_must_fail for --root without --onto, because it no longer does!

Cheers,

Chris.