diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-21 11:30:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-21 11:30:14 -0700 |
| commit | f46cdf4a3a9ba0c5a5dfe754cfbf433626bc275e (patch) | |
| tree | 2ca1df27585a5b62186523574f7c7d5528c16938 | |
| parent | 4c5dbf1c142e8fd8a58af461412a10d511eb4691 (diff) | |
| parent | 206a6ae01355e4d5d0e01e6d99d960fcc907e6b3 (diff) | |
| download | git-f46cdf4a3a9ba0c5a5dfe754cfbf433626bc275e.tar.gz | |
Merge branch 'ml/filter-branch-portability-fix'
Shell script portability fix.
* ml/filter-branch-portability-fix:
filter-branch: use printf instead of echo -e
| -rwxr-xr-x | git-filter-branch.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |