summaryrefslogtreecommitdiff
path: root/pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-05 06:11:38 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-05 21:18:00 (GMT)
commita48e1d67e167507091f25dc00e2bd6c280fa538e (patch)
treefe68efbb7cf2f5c5c2d4ba448db7f50274fa3d43 /pull.c
parentf78c79c5d4486f47dcd69ea7fef93e84051d4496 (diff)
downloadgit-a48e1d67e167507091f25dc00e2bd6c280fa538e.zip
git-a48e1d67e167507091f25dc00e2bd6c280fa538e.tar.gz
git-a48e1d67e167507091f25dc00e2bd6c280fa538e.tar.bz2
[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 'pull.c')
-rw-r--r--pull.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/pull.c b/pull.c
index cd77738..f4f1d8f 100644
--- a/pull.c
+++ b/pull.c
@@ -6,6 +6,7 @@
int get_tree = 0;
int get_history = 0;
+/* 1 means "get delta", 2 means "really check delta harder */
int get_delta = 1;
int get_all = 0;
int get_verbosely = 0;
@@ -32,12 +33,16 @@ static void report_missing(const char *what, const unsigned char *missing)
static int make_sure_we_have_it(const char *what, unsigned char *sha1)
{
- int status;
- if (has_sha1_file(sha1))
+ int status = 0;
+
+ if (!has_sha1_file(sha1)) {
+ status = fetch(sha1);
+ if (status && what)
+ report_missing(what, sha1);
+ }
+ else if (get_delta < 2)
return 0;
- status = fetch(sha1);
- if (status && what)
- report_missing(what, sha1);
+
if (get_delta) {
char delta_sha1[20];
status = sha1_delta_base(sha1, delta_sha1);