Merge branch 'maint'

[git.git] / builtin / revert.c

diff --git a/builtin/revert.c b/builtin/revert.c
index 0a86fecbd00d65f1f93c454b854ffd03c051ab3d..0d8020cf640e1abe6898308a1656446b327c83f4 100644 (file)
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -905,7 +905,7 @@ static int rollback_single_pick(void)
        if (!file_exists(git_path("CHERRY_PICK_HEAD")) &&
            !file_exists(git_path("REVERT_HEAD")))
                return error(_("no cherry-pick or revert in progress"));
-       if (!resolve_ref("HEAD", head_sha1, 0, NULL))
+       if (read_ref_full("HEAD", head_sha1, 0, NULL))
                return error(_("cannot resolve HEAD"));
        if (is_null_sha1(head_sha1))
                return error(_("cannot abort from a branch yet to be born"));