From b54768df01ee2421f5e7fc3744ca47b6887ed8c0 Mon Sep 17 00:00:00 2001
From: root <root@localhost>
Date: Wed, 7 Nov 2012 07:21:51 +0900
Subject: [PATCH] Simplify formatting of the manifest

---
 git-remote-gcrypt | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/git-remote-gcrypt b/git-remote-gcrypt
index b353691..3db71d5 100755
--- 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" ]