[PATCH] Fix rename/copy when dealing with temporarily broken pairs.

diff --git a/local-pull.c b/local-pull.c
index 1eec8927dbfa3af934651b25ded738d192706286..8bfe67b4071b6445210a06e51b0d5f1c5b1ba113 100644 (file)
--- a/local-pull.c
+++ b/local-pull.c
@@ -1,14 +1,8 @@
 /*
  * 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;
@@ -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,13 @@ int fetch(unsigned char *sha1)
        return -1;
 }
 
+int fetch_ref(char *ref, unsigned char *sha1)
+{
+       return -1;
+}
+
 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] [-l] [-s] [-n] [-v] [-d] [--recover] commit-id path";
 
 /* 
  * By default we only use file copy.
@@ -99,6 +97,10 @@ 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;