X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Frevert.c;h=57b51e4a0e148062e1945d640b81559d65e4c2ba;hb=385cc9d8c44eb5be9d57e630129752a72c0a08c8;hp=4b47ace36b51566acb5b748f679070f02cbbf568;hpb=f9c8e7c8f134597f34315cb1b5fcd4598c3453ca;p=git.git diff --git a/builtin/revert.c b/builtin/revert.c index 4b47ace36..57b51e4a0 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -442,7 +442,7 @@ static int do_pick_commit(void) else parent = commit->parents->item; - if (allow_ff && !hashcmp(parent->object.sha1, head)) + if (allow_ff && parent && !hashcmp(parent->object.sha1, head)) return fast_forward_to(commit->object.sha1, head); if (parent && parse_commit(parent) < 0)