Merge with gitk.

diff --git a/local-pull.c b/local-pull.c
index afdba9f527e2e78fcd62667cd17323e28a8ecb94..b715203f6fb482cce8b00cc99c72384e42528b36 100644 (file)
--- a/local-pull.c
+++ b/local-pull.c
@@ -9,7 +9,11 @@ static int use_link = 0;
 static int use_symlink = 0;
 static int use_filecopy = 1;
 
-static char *path;
+static char *path; /* "Remote" git repository */
+
+void prefetch(unsigned char *sha1)
+{
+}
 
 int fetch(unsigned char *sha1)
 {
@@ -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;
                }
@@ -73,8 +77,36 @@ int fetch(unsigned char *sha1)
        return -1;
 }
 
-static const char *local_pull_usage = 
-"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] [--recover] commit-id path";
+int fetch_ref(char *ref, unsigned char *sha1)
+{
+       static int ref_name_start = -1;
+       static char filename[PATH_MAX];
+       static char hex[41];
+       int ifd;
+
+       if (ref_name_start < 0) {
+               sprintf(filename, "%s/refs/", path);
+               ref_name_start = strlen(filename);
+       }
+       strcpy(filename + ref_name_start, ref);
+       ifd = open(filename, O_RDONLY);
+       if (ifd < 0) {
+               close(ifd);
+               fprintf(stderr, "cannot open %s\n", filename);
+               return -1;
+       }
+       if (read(ifd, hex, 40) != 40 || get_sha1_hex(hex, sha1)) {
+               close(ifd);
+               fprintf(stderr, "cannot read from %s\n", filename);
+               return -1;
+       }
+       close(ifd);
+       pull_say("ref %s\n", sha1_to_hex(sha1));
+       return 0;
+}
+
+static const char local_pull_usage[] =
+"git-local-pull [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path";
 
 /* 
  * By default we only use file copy.
@@ -92,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;
@@ -109,6 +137,8 @@ int main(int argc, char **argv)
                        use_filecopy = 0;
                else if (argv[arg][1] == 'v')
                        get_verbosely = 1;
+               else if (argv[arg][1] == 'w')
+                       write_ref = argv[++arg];
                else
                        usage(local_pull_usage);
                arg++;