From: Johannes Sixt <j.sixt@viscovery.net>
Date: Thu, 25 Apr 2013 10:59:41 +0000 (+0200)
Subject: git-remote-testgit: further remove some bashisms
X-Git-Tag: v1.8.4-rc0~256^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85d501ce63d3c3b1331f9e51252c128c95e0adf1;p=thirdparty%2Fgit.git

git-remote-testgit: further remove some bashisms

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---

diff --git a/git-remote-testgit b/git-remote-testgit
index 643e4aeb19..b5289493e2 100755
--- a/git-remote-testgit
+++ b/git-remote-testgit
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Copyright (c) 2012 Felipe Contreras
 
 alias=$1
@@ -23,7 +23,6 @@ then
 	testgitmarks="$dir/testgit.marks"
 	test -e "$gitmarks" || >"$gitmarks"
 	test -e "$testgitmarks" || >"$testgitmarks"
-	testgitmarks_args=( "--"{import,export}"-marks=$testgitmarks" )
 fi
 
 while read line
@@ -69,7 +68,10 @@ do
 		fi
 
 		echo "feature done"
-		git fast-export "${testgitmarks_args[@]}" $refs |
+		git fast-export \
+			${testgitmarks:+"--import-marks=$testgitmarks"} \
+			${testgitmarks:+"--export-marks=$testgitmarks"} \
+			$refs |
 		sed -e "s#refs/heads/#${prefix}/heads/#g"
 		echo "done"
 		;;
@@ -88,7 +90,10 @@ do
 
 		before=$(git for-each-ref --format=' %(refname) %(objectname) ')
 
-		git fast-import "${testgitmarks_args[@]}" --quiet
+		git fast-import \
+			${testgitmarks:+"--import-marks=$testgitmarks"} \
+			${testgitmarks:+"--export-marks=$testgitmarks"} \
+			--quiet
 
 		# figure out which refs were updated
 		git for-each-ref --format='%(refname) %(objectname)' |