diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-24 20:44:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 20:44:46 (GMT) |
| commit | 2f9d2e22cb553d26e355e63171678a848170dcf8 (patch) | |
| tree | 9b2b237fb9cc9beee2c602ce3c7822b0b456fcb8 /builtin | |
| parent | eeae6d754627343cfa9f1c72c5c00a3d949e9302 (diff) | |
| parent | 6355e505bacf0a12a5de77bcd0c1198e74ad340b (diff) | |
| download | git-2f9d2e22cb553d26e355e63171678a848170dcf8.zip git-2f9d2e22cb553d26e355e63171678a848170dcf8.tar.gz git-2f9d2e22cb553d26e355e63171678a848170dcf8.tar.bz2 | |
Merge branch 'bc/fix-cherry-pick-root' into maint
* bc/fix-cherry-pick-root:
builtin/revert.c: don't dereference a NULL pointer
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/revert.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 4b47ace..57b51e4 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) |