| commit | 9cf5673475871707dbeb986d29531e94ed655849 | [log] [tgz] |
|---|---|---|
| author | Vincent Driessen <vincent@datafox.nl> | 周二 2月 02 11:57:51 2010 +0100 |
| committer | Vincent Driessen <vincent@datafox.nl> | 周二 2月 02 11:57:51 2010 +0100 |
| tree | 16a93919a8edca5f033594269a07eac541163395 | |
| parent | c62633fbe477a242669659d9042c2bd24c16c4a1 [diff] [blame] |
Fix: do integer comparison, not string comparison. wc returns stuff like ' 13', which is perfectly equal to 13.
diff --git a/git-flow-feature b/git-flow-feature index 2961461..9b64d72 100644 --- a/git-flow-feature +++ b/git-flow-feature
@@ -251,7 +251,7 @@ # 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