From: Junio C Hamano <junkio@cox.net>
Date: Tue, 16 Aug 2005 05:48:09 +0000 (-0700)
Subject: [PATCH] Fix local pull that uses packs.
X-Git-Tag: v0.99.5~19^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d920032042c9fb3de04db640afe8611dfd4b6c21;p=git.git

[PATCH] Fix local pull that uses packs.

The patch mixed up the sha1 for the object being pulled, and the
sha1 the pull engine internally use to represent the name of the
pack that contains the object being pulled.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/local-pull.c b/local-pull.c
index 7e47ec059..8b16f50e3 100644
--- a/local-pull.c
+++ b/local-pull.c
@@ -43,7 +43,7 @@ int setup_indices()
 		if (namelen != 50 || 
 		    strcmp(de->d_name + namelen - 5, ".pack"))
 			continue;
-		get_sha1_hex(sha1, de->d_name + 5);
+		get_sha1_hex(de->d_name + 5, sha1);
 		setup_index(sha1);
 	}
 	return 0;
@@ -114,11 +114,13 @@ int fetch_pack(unsigned char *sha1)
 			sha1_to_hex(sha1));
 	}
 	sprintf(filename, "%s/objects/pack/pack-%s.pack", 
-		path, sha1_to_hex(sha1));
-	copy_file(filename, sha1_pack_name(sha1), sha1_to_hex(sha1));
+		path, sha1_to_hex(target->sha1));
+	copy_file(filename, sha1_pack_name(target->sha1),
+		  sha1_to_hex(target->sha1));
 	sprintf(filename, "%s/objects/pack/pack-%s.idx", 
-		path, sha1_to_hex(sha1));
-	copy_file(filename, sha1_pack_index_name(sha1), sha1_to_hex(sha1));
+		path, sha1_to_hex(target->sha1));
+	copy_file(filename, sha1_pack_index_name(target->sha1),
+		  sha1_to_hex(target->sha1));
 	install_packed_git(target);
 	return 0;
 }