path: root/pull.c
diff options
authorJunio C Hamano <>2005-06-02 22:19:00 (GMT)
committerLinus Torvalds <>2005-06-02 22:48:33 (GMT)
commit4a62b61939396c512bd7592f800110bddf45af72 (patch)
treee4853f8b57ac6ae9b5b13001fdc04fde45ed5e74 /pull.c
parent3b42a63cb5845ef1c818f6b00e693c61469ee966 (diff)
[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 <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'pull.c')
1 files changed, 7 insertions, 0 deletions
diff --git a/pull.c b/pull.c
index 0bed44f..cd77738 100644
--- a/pull.c
+++ b/pull.c
@@ -6,6 +6,7 @@
int get_tree = 0;
int get_history = 0;
+int get_delta = 1;
int get_all = 0;
int get_verbosely = 0;
static unsigned char current_commit_sha1[20];
@@ -37,6 +38,12 @@ static int make_sure_we_have_it(const char *what, unsigned char *sha1)
status = fetch(sha1);
if (status && what)
report_missing(what, sha1);
+ if (get_delta) {
+ char delta_sha1[20];
+ status = sha1_delta_base(sha1, delta_sha1);
+ if (0 < status)
+ status = make_sure_we_have_it(what, delta_sha1);
+ }
return status;