From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Mar 2018 18:30:14 +0000 (-0700)
Subject: Merge branch 'ml/filter-branch-portability-fix'
X-Git-Tag: v2.17.0-rc1~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f46cdf4a3a9ba0c5a5dfe754cfbf433626bc275e?hp=4c5dbf1c142e8fd8a58af461412a10d511eb4691

Merge branch 'ml/filter-branch-portability-fix'

Shell script portability fix.

* ml/filter-branch-portability-fix:
filter-branch: use printf instead of echo -e
---

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 1b7e4b2cdb..98c76ec589 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -627,12 +627,12 @@ then
 				print H "$_:$f\n" or die;
 			}
 			close(H) or die;' || die "Unable to save state")
-	state_tree=$(/bin/echo -e "100644 blob $state_blob\tfilter.map" | git mktree)
+	state_tree=$(printf '100644 blob %s\tfilter.map\n' "$state_blob" | git mktree)
 	if test -n "$state_commit"
 	then
-		state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" -p "$state_commit")
+		state_commit=$(echo "Sync" | git commit-tree "$state_tree" -p "$state_commit")
 	else
-		state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" )
+		state_commit=$(echo "Sync" | git commit-tree "$state_tree" )
 	fi
 	git update-ref "$state_branch" "$state_commit"
 fi