[PATCH 2/3] revert: allow reverting a root commit
- From
Jeff King <peff@peff.net>
- Date
- May 12, 2011, 11:09 UTC
- Message-ID
- <20110512110955.GB5292@sigill.intra.peff.net>
- In-Reply-To
- <20110512110855.GA5240@sigill.intra.peff.net>
Although it is probably an uncommon operation, there is no reason to disallow it, as it works just fine. It is the reverse of a cherry-pick of a root commit, which is already allowed.
We do have to tweak one check on whether we have a merge commit, which assumed we had at least one parent.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/revert.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c index f697e66..1f27c63 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -408,8 +408,6 @@ static int do_pick_commit(void) discard_cache(); if (!commit->parents) { - if (action == REVERT) - die (_("Cannot revert a root commit")); parent = NULL; } else if (commit->parents->next) { @@ -467,7 +465,7 @@ static int do_pick_commit(void) strbuf_addstr(&msgbuf, "\"\n\nThis reverts commit "); strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1)); - if (commit->parents->next) { + if (commit->parents && commit->parents->next) { strbuf_addstr(&msgbuf, ", reversing\nchanges made to "); strbuf_addstr(&msgbuf, sha1_to_hex(parent->object.sha1)); }
-- 1.7.5.1.12.ga7abed