Simplify formatting of the manifest

diff --git a/git-remote-gcrypt b/git-remote-gcrypt
index b353691bfa528b04a6479ad37decd9db335ee2d7..3db71d588c97d95453a2d55772d6034a51fddf9b 100755 (executable)
--- a/git-remote-gcrypt
+++ b/git-remote-gcrypt
@@ -84,7 +84,6 @@ splitcolon()
        setvar "$2" "${1%%:*}"
        setvar "$3" "${1#*:}"
 }
-repoidstr() { xecho "repo $Repoid"; }
 
 ## gitception part
 # Fetch giturl $1, file $2
@@ -718,9 +717,13 @@ EOF
 
        TmpManifest_Enc="$Localdir/tmp_manifest.$$"
 
-       (xecho "$Branchlist"; xecho "$Packlist"; xecho "$Keeplist";
-       repoidstr; xecho "$Extension_list") |
-               PRIVENCRYPT "$Recipients" > "$TmpManifest_Enc"
+       PRIVENCRYPT "$Recipients" > "$TmpManifest_Enc" <<EOF
+$Branchlist
+$Packlist
+$Keeplist
+repo $Repoid
+$Extension_list
+EOF
 
        # Upload pack
        if [ -s "$TmpObjlist" ]