summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorBryan Donlan <bdonlan@fushizen.net>2008-05-04 01:37:51 -0400
committerJunio C Hamano <gitster@pobox.com>2008-05-05 14:17:00 -0700
commit97b88dd58cad9d60427af9a956f90f7803f55db8 (patch)
tree3df90e3c81678b1665195563b59198e88e74d19d /git-rebase.sh
parentc697ad143ba1ff58b29e7efe149d244d4b7010a5 (diff)
downloadgit-97b88dd58cad9d60427af9a956f90f7803f55db8.tar.gz
git-rebase.sh: Fix --merge --abort failures when path contains whitespace
Also update t/t3407-rebase-abort.sh to expose the bug. Signed-off-by: Bryan Donlan <bdonlan@fushizen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 9b13b833cb..c43afe51ab 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -214,7 +214,7 @@ do
else
die "No rebase in progress?"
fi
- git reset --hard $(cat $dotest/orig-head)
+ git reset --hard $(cat "$dotest/orig-head")
rm -r "$dotest"
exit
;;