aboutsummaryrefslogtreecommitdiff
path: root/http-pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-04 23:11:38 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 14:18:00 -0700
commita48e1d67e167507091f25dc00e2bd6c280fa538e (patch)
treefe68efbb7cf2f5c5c2d4ba448db7f50274fa3d43 /http-pull.c
parentf78c79c5d4486f47dcd69ea7fef93e84051d4496 (diff)
downloadgit-a48e1d67e167507091f25dc00e2bd6c280fa538e.tar.gz
git-a48e1d67e167507091f25dc00e2bd6c280fa538e.tar.xz
[PATCH] pull: gracefully recover from delta retrieval failure.
This addresses a concern raised by Jason McMullan in the mailing list discussion. After retrieving and storing a potentially deltified object, pull logic tries to check and fulfil its delta dependency. When the pull procedure is killed at this point, however, there was no easy way to recover by re-running pull, since next run would have found that we already have that deltified object and happily reported success, without really checking its delta dependency is satisfied. This patch introduces --recover option to git-*-pull family which causes them to re-validate dependency of deltified objects we are fetching. A new test t5100-delta-pull.sh covers such a failure mode. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'http-pull.c')
-rw-r--r--http-pull.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/http-pull.c b/http-pull.c
index 551663e49..ec7f66af8 100644
--- a/http-pull.c
+++ b/http-pull.c
@@ -105,6 +105,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;
@@ -115,7 +117,7 @@ int main(int argc, char **argv)
arg++;
}
if (argc < arg + 2) {
- usage("git-http-pull [-c] [-t] [-a] [-d] [-v] commit-id url");
+ usage("git-http-pull [-c] [-t] [-a] [-d] [-v] [--recover] commit-id url");
return 1;
}
commit_id = argv[arg];