summaryrefslogtreecommitdiff
path: root/pull.h
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.h
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.h')
-rw-r--r--pull.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/pull.h b/pull.h
index 3cd14cf..30086fd 100644
--- a/pull.h
+++ b/pull.h
@@ -13,7 +13,9 @@ extern int get_history;
/** Set to fetch the trees in the commit history. **/
extern int get_all;
-/* Set to zero to skip the check for delta object base. */
+/* Set to zero to skip the check for delta object base;
+ * set to two to check delta dependency even for objects we already have.
+ */
extern int get_delta;
/* Set to be verbose */