[PATCH] Fix git-merge-cache -q

[git.git] / local-pull.c

diff --git a/local-pull.c b/local-pull.c
index 2f06fbe..b715203 100644 (file)
--- a/local-pull.c
+++ b/local-pull.c
@@ -11,6 +11,10 @@ static int use_filecopy = 1;
 
 static char *path; /* "Remote" git repository */
 
+void prefetch(unsigned char *sha1)
+{
+}
+
 int fetch(unsigned char *sha1)
 {
        static int object_name_start = -1;
@@ -54,7 +58,7 @@ int fetch(unsigned char *sha1)
                }
                map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, ifd, 0);
                close(ifd);
-               if (-1 == (int)(long)map) {
+               if (map == MAP_FAILED) {
                        fprintf(stderr, "cannot mmap %s\n", filename);
                        return -1;
                }
@@ -101,7 +105,7 @@ int fetch_ref(char *ref, unsigned char *sha1)
        return 0;
 }
 
-static const char *local_pull_usage = 
+static const char local_pull_usage[] =
 "git-local-pull [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path";
 
 /*