2011/12/10 Jonathan Nieder <jrnieder@xxxxxxxxx>:
>> --- 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"));
>
> Unrelated change that snuck in, I assume?
Yeah that slipped in. It should be part of c689332 (Convert many
resolve_ref() calls to read_ref*() and ref_exists() - 2011-11-13). I
guess either I missed it or it was a new call site after that patch.
Split it out as a separate patch?
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html