[PATCH] pull: gracefully recover from delta retrieval failure.

[git.git] / rpull.c

diff --git a/rpull.c b/rpull.c
index f4ab898..a332fba 100644 (file)
--- a/rpull.c
+++ b/rpull.c
@@ -52,6 +52,8 @@ int main(int argc, char **argv)
                        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;
@@ -62,7 +64,7 @@ int main(int argc, char **argv)
                arg++;
        }
        if (argc < arg + 2) {
-               usage("git-rpull [-c] [-t] [-a] [-v] [-d] commit-id url");
+               usage("git-rpull [-c] [-t] [-a] [-v] [-d] [--recover] commit-id url");
                return 1;
        }
        commit_id = argv[arg];