aboutsummaryrefslogtreecommitdiff
path: root/local-pull.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-02 15:19:00 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-02 15:48:33 -0700
commit4a62b61939396c512bd7592f800110bddf45af72 (patch)
treee4853f8b57ac6ae9b5b13001fdc04fde45ed5e74 /local-pull.c
parent3b42a63cb5845ef1c818f6b00e693c61469ee966 (diff)
downloadgit-4a62b61939396c512bd7592f800110bddf45af72.tar.gz
git-4a62b61939396c512bd7592f800110bddf45af72.tar.xz
[PATCH] Handle deltified object correctly in git-*-pull family.
When a remote repository is deltified, we need to get the objects that a deltified object we want to obtain is based upon. The initial parts of each retrieved SHA1 file is inflated and inspected to see if it is deltified, and its base object is asked from the remote side when it is. Since this partial inflation and inspection has a small performance hit, it can optionally be skipped by giving -d flag to git-*-pull commands. This flag should be used only when the remote repository is known to have no deltified objects. Rsync transport does not have this problem since it fetches everything the remote side has. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'local-pull.c')
-rw-r--r--local-pull.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/local-pull.c b/local-pull.c
index 10d4ca890..e5d834ff2 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] commit-id path";
+"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] commit-id path";
/*
* By default we only use file copy.
@@ -92,6 +92,8 @@ int main(int argc, char **argv)
get_tree = 1;
else if (argv[arg][1] == 'c')
get_history = 1;
+ else if (argv[arg][1] == 'd')
+ get_delta = 0;
else if (argv[arg][1] == 'a') {
get_all = 1;
get_tree = 1;