Fix up applymbox script for the addition of "git-" prefix

diff --git a/local-pull.c b/local-pull.c
index 1eec8927dbfa3af934651b25ded738d192706286..2f06fbee8b840a7ae642f5a22e2cb993687f3470 100644 (file)
--- a/local-pull.c
+++ b/local-pull.c
@@ -1,21 +1,15 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
 #include "cache.h"
 #include "commit.h"
-#include <errno.h>
-#include <stdio.h>
 #include "pull.h"
 
 static int use_link = 0;
 static int use_symlink = 0;
 static int use_filecopy = 1;
 
-static char *path;
+static char *path; /* "Remote" git repository */
 
 int fetch(unsigned char *sha1)
 {
@@ -70,8 +64,7 @@ int fetch(unsigned char *sha1)
                munmap(map, st.st_size);
                close(ofd);
                if (status)
-                       fprintf(stderr, "cannot write %s (%ld bytes)\n",
-                               dest_filename, st.st_size);
+                       fprintf(stderr, "cannot write %s\n", dest_filename);
                else
                        pull_say("copy %s\n", hex);
                return status;
@@ -80,8 +73,36 @@ int fetch(unsigned char *sha1)
        return -1;
 }
 
+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] [-l] [-s] [-n] [-v] commit-id path";
+"git-local-pull [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path";
 
 /* 
  * By default we only use file copy.
@@ -112,6 +133,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++;