summaryrefslogtreecommitdiff
path: root/Documentation
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 /Documentation
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 'Documentation')
-rw-r--r--Documentation/git-http-pull.txt5
-rw-r--r--Documentation/git-local-pull.txt5
-rw-r--r--Documentation/git-rpull.txt5
3 files changed, 12 insertions, 3 deletions
diff --git a/Documentation/git-http-pull.txt b/Documentation/git-http-pull.txt
index 8b54f09..e4b7b37 100644
--- a/Documentation/git-http-pull.txt
+++ b/Documentation/git-http-pull.txt
@@ -9,7 +9,7 @@ git-http-pull - Downloads a remote GIT repository via HTTP
SYNOPSIS
--------
-'git-http-pull' [-c] [-t] [-a] [-v] [-d] commit-id url
+'git-http-pull' [-c] [-t] [-a] [-v] [-d] [--recover] commit-id url
DESCRIPTION
-----------
@@ -25,6 +25,9 @@ Downloads a remote GIT repository via HTTP.
Do not check for delta base objects (use this option
only when you know the remote repository is not
deltified).
+--recover::
+ Check dependency of deltified object more carefully than
+ usual, to recover after earlier pull that was interrupted.
-v::
Report what is downloaded.
diff --git a/Documentation/git-local-pull.txt b/Documentation/git-local-pull.txt
index 79d0f5c..4bc66e7 100644
--- a/Documentation/git-local-pull.txt
+++ b/Documentation/git-local-pull.txt
@@ -9,7 +9,7 @@ git-local-pull - Duplicates another GIT repository on a local system
SYNOPSIS
--------
-'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
DESCRIPTION
-----------
@@ -27,6 +27,9 @@ OPTIONS
Do not check for delta base objects (use this option
only when you know the remote repository is not
deltified).
+--recover::
+ Check dependency of deltified object more carefully than
+ usual, to recover after earlier pull that was interrupted.
-v::
Report what is downloaded.
diff --git a/Documentation/git-rpull.txt b/Documentation/git-rpull.txt
index 3a83866..a6c40ae 100644
--- a/Documentation/git-rpull.txt
+++ b/Documentation/git-rpull.txt
@@ -10,7 +10,7 @@ git-rpull - Pulls from a remote repository over ssh connection
SYNOPSIS
--------
-'git-rpull' [-c] [-t] [-a] [-d] [-v] commit-id url
+'git-rpull' [-c] [-t] [-a] [-d] [-v] [--recover] commit-id url
DESCRIPTION
-----------
@@ -29,6 +29,9 @@ OPTIONS
Do not check for delta base objects (use this option
only when you know the remote repository is not
deltified).
+--recover::
+ Check dependency of deltified object more carefully than
+ usual, to recover after earlier pull that was interrupted.
-v::
Report what is downloaded.