Merge git-gui into ml/git-gui-exec-path-fix

[thirdparty/git.git] / checkout.c

diff --git a/checkout.c b/checkout.c
index 2e39dae684f8f0a048d172f36b21740f92e7de57..4256e71a7c41cd4fdfbcd832727c21548b52b740 100644 (file)
--- a/checkout.c
+++ b/checkout.c
@@ -1,8 +1,11 @@
-#include "cache.h"
+#include "git-compat-util.h"
+#include "object-name.h"
 #include "remote.h"
 #include "refspec.h"
+#include "repository.h"
 #include "checkout.h"
 #include "config.h"
+#include "strbuf.h"
 
 struct tracking_name_data {
        /* const */ char *src_ref;
@@ -23,7 +26,7 @@ static int check_tracking_name(struct remote *remote, void *cb_data)
        memset(&query, 0, sizeof(struct refspec_item));
        query.src = cb->src_ref;
        if (remote_find_tracking(remote, &query) ||
-           get_oid(query.dst, cb->dst_oid)) {
+           repo_get_oid(the_repository, query.dst, cb->dst_oid)) {
                free(query.dst);
                return 0;
        }