mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

filter-branch: use printf instead of echo -e

Browse Source 
In order to echo a tab character, it's better to use printf instead of
"echo -e", because it's more portable (for instance, "echo -e" doesn't work
as expected on a Mac).

This solves the "fatal: Not a valid object name" error in git-filter-branch
when using the --state-branch option.

Furthermore, let's switch from "/bin/echo" to just "echo", so that the
built-in echo command is used where available.

Signed-off-by: Michele Locati <michele@locati.it>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michele Locati
2018-03-19 16:52:59 +01:00
committed by Junio C Hamano
parent 3013dff866
commit 206a6ae013
1 changed files with 3 additions and 3 deletions
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