Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxx>
---
git-rebase--interactive.sh | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index ec4a068..9041d15 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -871,8 +871,7 @@ check_bad_cmd_and_sha () {
while read -r line
do
IFS=' '
- set x $line
- shift
+ set -- $line
command=$1
sha1=$2
@@ -881,8 +880,7 @@ check_bad_cmd_and_sha () {
# Doesn't expect a SHA-1
;;
pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f)
- check_commit_sha $sha1 "$line"
- if test $? -ne 0
+ if ! check_commit_sha $sha1 "$line"
then
retval=1
fi
@@ -988,8 +986,7 @@ check_todo_list () {
;;
esac
- check_bad_cmd_and_sha <"$todo"
- if test $? -ne 0
+ if ! check_bad_cmd_and_sha <"$todo"
then
raise_error=t
fi
--
2.5.0.rc0.10.g7792c2a
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html