kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

[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>
maint
Junio C Hamano 2005-08-15 22:48:09 -07:00
parent 08b1161697
commit d920032042
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
local-pull.c
View File

@ -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;
}