cocci: apply the "cache.h" part of "the_repository.pending"
Apply the part of "the_repository.pending.cocci" pertaining to "cache.h". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
7258e892d2
commit
d850b7a545
4
reset.c
4
reset.c
@ -38,7 +38,7 @@ static int update_refs(const struct reset_head_opts *opts,
|
||||
prefix_len = msg.len;
|
||||
|
||||
if (update_orig_head) {
|
||||
if (!get_oid("ORIG_HEAD", &oid_old_orig))
|
||||
if (!repo_get_oid(the_repository, "ORIG_HEAD", &oid_old_orig))
|
||||
old_orig = &oid_old_orig;
|
||||
if (head) {
|
||||
if (!reflog_orig_head) {
|
||||
@ -106,7 +106,7 @@ int reset_head(struct repository *r, const struct reset_head_opts *opts)
|
||||
goto leave_reset_head;
|
||||
}
|
||||
|
||||
if (!get_oid("HEAD", &head_oid)) {
|
||||
if (!repo_get_oid(the_repository, "HEAD", &head_oid)) {
|
||||
head = &head_oid;
|
||||
} else if (!oid || !reset_hard) {
|
||||
ret = error(_("could not determine HEAD revision"));
|
||||
|
Reference in New Issue
Block a user