Fix: do integer comparison, not string comparison. wc returns stuff like ' 13', which is perfectly equal to 13.
This commit is contained in:
parent
c62633fbe4
commit
9cf5673475
1 changed files with 1 additions and 1 deletions
|
@ -251,7 +251,7 @@ cmd_finish() {
|
||||||
|
|
||||||
# merge into BASE
|
# merge into BASE
|
||||||
git checkout $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
|
git merge --ff $BRANCH
|
||||||
else
|
else
|
||||||
git merge --no-ff $BRANCH
|
git merge --no-ff $BRANCH
|
||||||
|
|
Loading…
Reference in a new issue