summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Brandon Casey <drafnel@gmail.com>2010-08-13 15:47:35 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-13 14:21:22 -0700
commitd1c3b10f7ced34a607c50de8b5c271ce9cf764ea (patch)
tree968bbf671511513c6ed94309910b2e8fad62b899
parentgit-rebase--interactive.sh: rework skip_unnecessary_picks (diff)
downloadtgif-d1c3b10f7ced34a607c50de8b5c271ce9cf764ea.tar.xz
git-rebase--interactive.sh: use printf instead of echo to print commit message
Replace the echo statements that operate on $rest with printf's to restore what was lost from 938791cd. This avoids any mangling that XSI-conformant echo's may introduce. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-rebase--interactive.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3b10513806..e16dbe201d 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -625,7 +625,7 @@ skip_unnecessary_picks () {
case "$fd,$command" in
3,pick|3,p)
# pick a commit whose parent is current $ONTO -> skip
- sha1=$(echo "$rest" | cut -d ' ' -f 1)
+ sha1=$(printf '%s' "$rest" | cut -d ' ' -f 1)
case "$(git rev-parse --verify --quiet "$sha1"^)" in
"$ONTO"*)
ONTO=$sha1
@@ -642,7 +642,7 @@ skip_unnecessary_picks () {
fd=1
;;
esac
- echo "$command${rest:+ }$rest" >&$fd
+ printf '%s\n' "$command${rest:+ }$rest" >&$fd
done <"$TODO" >"$TODO.new" 3>>"$DONE" &&
mv -f "$TODO".new "$TODO" &&
case "$(peek_next_command)" in