[PATCH] Fix git-merge-one-file permissions auto-merging

[git.git] / http-pull.c

diff --git a/http-pull.c b/http-pull.c
index ba8585c..f49525c 100644 (file)
--- a/http-pull.c
+++ b/http-pull.c
@@ -92,6 +92,11 @@ int fetch(unsigned char *sha1)
        return 0;
 }
 
+int fetch_ref(char *ref, unsigned char *sha1)
+{
+       return -1;
+}
+
 int main(int argc, char **argv)
 {
        char *commit_id;
@@ -103,6 +108,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;
@@ -113,7 +122,7 @@ int main(int argc, char **argv)
                arg++;
        }
        if (argc < arg + 2) {
-               usage("git-http-pull [-c] [-t] [-a] [-v] commit-id url");
+               usage("git-http-pull [-c] [-t] [-a] [-d] [-v] [--recover] commit-id url");
                return 1;
        }
        commit_id = argv[arg];