git-merge-cache -o does all the automerges in a single shot

[git.git] / local-pull.c

diff --git a/local-pull.c b/local-pull.c
index ea38d87..3a342ab 100644 (file)
--- a/local-pull.c
+++ b/local-pull.c
@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#include <limits.h>
 #include "cache.h"
 #include "commit.h"
 #include <errno.h>
@@ -14,15 +15,9 @@
 static int use_link = 0;
 static int use_symlink = 0;
 static int use_filecopy = 1;
-static int verbose = 0;
 
 static char *path;
 
-static void say(const char *fmt, const char *hex) {
-       if (verbose)
-               fprintf(stderr, fmt, hex);
-}
-
 int fetch(unsigned char *sha1)
 {
        static int object_name_start = -1;
@@ -39,12 +34,19 @@ int fetch(unsigned char *sha1)
        filename[object_name_start+1] = hex[1];
        filename[object_name_start+2] = '/';
        strcpy(filename + object_name_start + 3, hex + 2);
-       if (use_link && !link(filename, dest_filename)) {
-               say("Hardlinked %s.\n", hex);
-               return 0;
+       if (use_link) {
+               if (!link(filename, dest_filename)) {
+                       pull_say("link %s\n", hex);
+                       return 0;
+               }
+               /* If we got ENOENT there is no point continuing. */
+               if (errno == ENOENT) {
+                       fprintf(stderr, "does not exist %s\n", filename);
+                       return -1;
+               }
        }
        if (use_symlink && !symlink(filename, dest_filename)) {
-               say("Symlinked %s.\n", hex);
+               pull_say("symlink %s\n", hex);
                return 0;
        }
        if (use_filecopy) {
@@ -54,13 +56,13 @@ int fetch(unsigned char *sha1)
                ifd = open(filename, O_RDONLY);
                if (ifd < 0 || fstat(ifd, &st) < 0) {
                        close(ifd);
-                       fprintf(stderr, "Cannot open %s\n", filename);
+                       fprintf(stderr, "cannot open %s\n", filename);
                        return -1;
                }
                map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, ifd, 0);
                close(ifd);
                if (-1 == (int)(long)map) {
-                       fprintf(stderr, "Cannot mmap %s\n", filename);
+                       fprintf(stderr, "cannot mmap %s\n", filename);
                        return -1;
                }
                ofd = open(dest_filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
@@ -69,13 +71,12 @@ 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
-                       say("Copied %s.\n", hex);
+                       pull_say("copy %s\n", hex);
                return status;
        }
-       fprintf(stderr, "No copy method was provided to copy %s.\n", hex);
+       fprintf(stderr, "failed to copy %s with given copy methods.\n", hex);
        return -1;
 }
 
@@ -110,7 +111,7 @@ int main(int argc, char **argv)
                else if (argv[arg][1] == 'n')
                        use_filecopy = 0;
                else if (argv[arg][1] == 'v')
-                       verbose = 1;
+                       get_verbosely = 1;
                else
                        usage(local_pull_usage);
                arg++;