jigen/git-remote-gcrypt
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Simplify the use of the object list file

Browse source
This commit is contained in:
root 2012-11-26 01:53:17 +04:00
parent 67697c2b32
commit bc1c097c42
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
git-remote-gcrypt
View file

@ -584,8 +584,7 @@ get_pack_files()
} }
# Download and unpack remote packfiles # Download and unpack remote packfiles
# $1 is objects tmpfile # $1 return var for list of packfiles to delete
# $2 return var for list of packfiles to delete
repack_if_needed() repack_if_needed()
{ {
local n_= m_= kline_= r_line= r_keep_packlist= r_del_list= local n_= m_= kline_= r_line= r_keep_packlist= r_del_list=
@ -627,10 +626,10 @@ EOF
(set +f; git verify-pack -v "$Localdir"/pack/*.idx || (set +f; git verify-pack -v "$Localdir"/pack/*.idx ||
echo_kill "git verify-pack failed!") | echo_kill "git verify-pack failed!") |
grep -E '^[0-9a-f]{40}' | cut -f 1 -d ' ' >> "$1" grep -E '^[0-9a-f]{40}' | cut -f 1 -d ' '
Packlist=$r_keep_packlist Packlist=$r_keep_packlist
setvar "$2" "$r_del_list" setvar "$1" "$r_del_list"
} }
do_capabilities() do_capabilities()
@ -724,12 +723,14 @@ EOF
tmp_encrypted=$(tempname packP) tmp_encrypted=$(tempname packP)
tmp_objlist=$(tempname objlP) tmp_objlist=$(tempname objlP)
xecho "$r_revlist" | git rev-list --objects --stdin -- > "$tmp_objlist" {
xfeed "$r_revlist" git rev-list --objects --stdin --
repack_if_needed @r_pack_delete
} > "$tmp_objlist"
# Only send pack if we have any objects to send # Only send pack if we have any objects to send
if [ -s "$tmp_objlist" ] if [ -s "$tmp_objlist" ]
then then
repack_if_needed "$tmp_objlist" @r_pack_delete
key_=$(genkey "$Packkey_bytes") key_=$(genkey "$Packkey_bytes")
(GIT_ALTERNATE_OBJECT_DIRECTORIES=$Localdir \ (GIT_ALTERNATE_OBJECT_DIRECTORIES=$Localdir \
git pack-objects --stdout < "$tmp_objlist" || git pack-objects --stdout < "$tmp_objlist" ||