path: root/local-pull.c
diff options
authorJunio C Hamano <>2005-06-05 06:11:38 (GMT)
committerLinus Torvalds <>2005-06-05 21:18:00 (GMT)
commita48e1d67e167507091f25dc00e2bd6c280fa538e (patch)
treefe68efbb7cf2f5c5c2d4ba448db7f50274fa3d43 /local-pull.c
parentf78c79c5d4486f47dcd69ea7fef93e84051d4496 (diff)
[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 covers such a failure mode. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'local-pull.c')
1 files changed, 3 insertions, 1 deletions
diff --git a/local-pull.c b/local-pull.c
index e5d834f..afdba9f 100644
--- a/local-pull.c
+++ b/local-pull.c
@@ -74,7 +74,7 @@ int fetch(unsigned char *sha1)
static const char *local_pull_usage =
-"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] 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.
@@ -94,6 +94,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;