X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=local-pull.c;h=b715203f6fb482cce8b00cc99c72384e42528b36;hb=3e386508f87278610d1892aaaa08cd17907f71c5;hp=2f06fbee8b840a7ae642f5a22e2cb993687f3470;hpb=b43d44779bf98977b211256f936d0edda8a9625a;p=git.git diff --git a/local-pull.c b/local-pull.c index 2f06fbee..b715203f 100644 --- 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"; /*