cocci: apply the "cache.h" part of "the_repository.pending"

[thirdparty/git.git] / builtin / pull.c

diff --git a/builtin/pull.c b/builtin/pull.c
index 1ab4de0005da3f6d2aa4b6a93d61544818af8700..880eebcdd657bfa19fc78e2d20e855a2a36436ca 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -1036,7 +1036,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
        if (file_exists(git_path_merge_head(the_repository)))
                die_conclude_merge();
 
-       if (get_oid("HEAD", &orig_head))
+       if (repo_get_oid(the_repository, "HEAD", &orig_head))
                oidclr(&orig_head);
 
        if (opt_rebase) {
@@ -1061,7 +1061,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
        if (opt_dry_run)
                return 0;
 
-       if (get_oid("HEAD", &curr_head))
+       if (repo_get_oid(the_repository, "HEAD", &curr_head))
                oidclr(&curr_head);
 
        if (!is_null_oid(&orig_head) && !is_null_oid(&curr_head) &&