X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=local-pull.c;h=b715203f6fb482cce8b00cc99c72384e42528b36;hb=f29eaed12fc07bc5b2e4d1a302136a26ff4488ce;hp=535bd8c297b51edd47b0477affcadf8b21e7f6bf;hpb=f5ab6ccae3063725e0a6bfacffaffb245d6df83c;p=git.git

diff --git a/local-pull.c b/local-pull.c
index 535bd8c2..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";
 
 /* 
@@ -120,10 +124,6 @@ int main(int argc, char **argv)
 			get_tree = 1;
 		else if (argv[arg][1] == 'c')
 			get_history = 1;
-		else if (argv[arg][1] == 'd')
-			get_delta = 0;
-		else if (!strcmp(argv[arg], "--recover"))
-			get_delta = 2;
 		else if (argv[arg][1] == 'a') {
 			get_all = 1;
 			get_tree = 1;