[PATCH 1/4] revert: convert resolve_ref() to read_ref_full()
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Dec 12, 2011, 11:20 UTC
- Message-ID
- <1323688832-32016-1-git-send-email-pclouds@gmail.com>
This is the follow up of c689332 (Convert many resolve_ref() calls to read_ref*() and ref_exists() - 2011-11-13). See the said commit for rationale.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- builtin/revert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c index 1ea525c..0c52a83 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -901,7 +901,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"));
-- 1.7.8.36.g69ee2