From 4d1f2999f16d90e58f09fc7031dcd1d751cc461a Mon Sep 17 00:00:00 2001 From: root Date: Sat, 10 Nov 2012 13:49:56 +0000 Subject: Use have_packs+ file directly with grep --- git-remote-gcrypt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'git-remote-gcrypt') diff --git a/git-remote-gcrypt b/git-remote-gcrypt index 8d17687..dc05f18 100755 --- a/git-remote-gcrypt +++ b/git-remote-gcrypt @@ -615,7 +615,7 @@ do_fetch() # The PACK id is the hash of the encrypted git packfile. # We only download packs mentioned in the encrypted manifest, # and check their digest when received. - local pack_= packline_= pneed_= phave_= premote_= + local pack_= packline_= pneed_= premote_= ensure_connected @@ -627,10 +627,14 @@ do_fetch() TmpPack_Encrypted="$Localdir/tmp_pack_ENCRYPTED_.$$" - premote_=$(xecho "$Packlist" | cut -f 1-2 -d ' ') # The `+` for $GITCEPTION is pointless but we will be safe for stacking - phave_="$(cat "$Localdir/have_packs+" 2>/dev/null || :)" - pneed_="$(xecho "$premote_" | xgrep -v -x -e "$phave_")" + premote_=$(xecho "$Packlist" | cut -f 1-2 -d ' ') + if [ -s "$Localdir/have_packs+" ] + then + pneed_="$(xecho "$premote_" | xgrep -v -x -f "$Localdir/have_packs+")" + else + pneed_=$premote_ + fi xecho "$pneed_" | while read packline_ do -- cgit v1.2.3