mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-02 11:11:23 +02:00
Code

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

Browse Source 
Shell script portability fix.

* ml/filter-branch-portability-fix:
  filter-branch: use printf instead of echo -e
This commit is contained in:
Junio C Hamano 2018-03-21 11:30:14 -07:00
commit f46cdf4a3a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-filter-branch.sh
View File

@ -627,12 +627,12 @@ then
print H "$_:$f\n" or die; print H "$_:$f\n" or die;
} }
close(H) or die;' || die "Unable to save state") 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" if test -n "$state_commit"
then 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 else
state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" ) state_commit=$(echo "Sync" | git commit-tree "$state_tree" )
fi fi
git update-ref "$state_branch" "$state_commit" git update-ref "$state_branch" "$state_commit"
fi fi