Commit 9cf56734 authored by Vincent Driessen's avatar Vincent Driessen

Fix: do integer comparison, not string comparison. wc returns stuff like ' ...

Fix: do integer comparison, not string comparison. wc returns stuff like '   13', which is perfectly equal to 13.
parent c62633fb
......@@ -251,7 +251,7 @@ cmd_finish() {
# merge into BASE
git checkout $BASE
if [ "$(git rev-list -n2 $BASE..$BRANCH | wc -l)" = "1" ]; then
if [ "$(git rev-list -n2 $BASE..$BRANCH | wc -l)" -eq 1 ]; then
git merge --ff $BRANCH
else
git merge --no-ff $BRANCH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment