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

Fix microissues

Browse source
This commit is contained in:
root 2013-02-14 00:00:00 +00:00
parent 27fe6e199d
commit 5245d68453
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
git-remote-gcrypt
View file

@ -42,7 +42,7 @@ xgrep() { command grep "$@" || : ; }
sort_C() { LC_ALL=C command sort "$@"; } sort_C() { LC_ALL=C command sort "$@"; }
sort_stable_k2() sort_stable_k2()
{ {
awk '{ printf("%08d\t%s\n", NR, $0) }' | sort_C -k3,3 -k1,1 | cut -f 2- awk '{ printf("%08d\t%s\n", NR, $0) }' | sort_C -k 3,3 -k 1,1 |cut -f 2-
} }
tac() { sed '1!G;h;$!d'; } tac() { sed '1!G;h;$!d'; }
@ -242,7 +242,7 @@ safe_git_rev_parse()
check_recipients() check_recipients()
{ {
Recipients="$(gpg --no-default-keyring --keyring "$Conf_keyring" \ Recipients="$(gpg --no-default-keyring --keyring "$Conf_keyring" \
--with-colons -k | xgrep ^pub | cut -f5 -d: | tr '\n' ' ')" --with-colons -k | xgrep ^pub | cut -f 5 -d ':' | tr '\n' ' ')"
# Split recipients by space, example "a b c" => -R a -R b -R c # Split recipients by space, example "a b c" => -R a -R b -R c
Recipients=$(xecho_n "$Recipients" | sed -e 's/\([^ ]\+\)/-R &/g') Recipients=$(xecho_n "$Recipients" | sed -e 's/\([^ ]\+\)/-R &/g')
if isnull "$Recipients" if isnull "$Recipients"
@ -360,7 +360,7 @@ do_list()
do_fetch() do_fetch()
{ {
# Security protocol: # Security protocol:
# The PACK id is the SHA-1 of the encrypted git packfile. # The PACK id is the hash of the encrypted git packfile.
# We only download packs mentioned in the encrypted manifest, # We only download packs mentioned in the encrypted manifest,
# and check their digest when received. # and check their digest when received.
local pack_= rcv_id= packline_= pneed_= pboth_= phave_= local pack_= rcv_id= packline_= pneed_= pboth_= phave_=
@ -410,7 +410,7 @@ do_push()
# Each git packfile is encrypted and then named for the encrypted # Each git packfile is encrypted and then named for the encrypted
# file's hash. The manifest is updated with the pack id. # file's hash. The manifest is updated with the pack id.
# The manifest is encrypted. # The manifest is encrypted.
local remote_has= remote_want= prefix_= suffix_= line_= new_branch= local remote_has= remote_want= prefix_= suffix_= line_= pack_id=
ensure_connected ensure_connected
check_recipients check_recipients
@ -424,7 +424,7 @@ do_push()
if isnonnull "$Branchlist" if isnonnull "$Branchlist"
then then
remote_has=$(xecho "$Branchlist" | remote_has=$(xecho "$Branchlist" |
cut -f1 -d' ' | sed -e 's/^\(.\)/^&/') cut -f 1 -d ' ' | sed -e 's/^\(.\)/^&/')
fi fi
while read line_ # from << while read line_ # from <<
@ -443,7 +443,7 @@ do_push()
$1 $1
EOF EOF
Branchlist=$(xecho "$Branchlist" | sort_stable_k2 | tac | uniq -s40) Branchlist=$(xecho "$Branchlist" | sort_stable_k2 | tac | uniq -s 40)
TmpPack_Encrypted="$Localdir/tmp_pack_ENCRYPTED_.$$" TmpPack_Encrypted="$Localdir/tmp_pack_ENCRYPTED_.$$"
TmpObjlist="$Localdir/tmp_packrevlist.$$" TmpObjlist="$Localdir/tmp_packrevlist.$$"