mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert: allow reverting a root commit

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2011-05-12 07:09:55 -04:00
committed by Junio C Hamano
parent 161807349a
commit fad2652673
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/revert.c
View File

@ -408,8 +408,6 @@ static int do_pick_commit(void)
discard_cache(); discard_cache();
if (!commit->parents) { if (!commit->parents) {
if (action == REVERT)
die (_("Cannot revert a root commit"));
parent = NULL; parent = NULL;
} }
else if (commit->parents->next) { 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, "\"\n\nThis reverts commit ");
strbuf_addstr(&msgbuf, sha1_to_hex(commit->object.sha1)); 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, ", reversing\nchanges made to ");
strbuf_addstr(&msgbuf, sha1_to_hex(parent->object.sha1)); strbuf_addstr(&msgbuf, sha1_to_hex(parent->object.sha1));
} }