Merge pull request #241 from glehmann/ff_only

properly deal with ff-only
frostming · Nov 12, 2018 · f3380e1 · f3380e1
2 parents 350b871 + daf8b8f
commit f3380e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/legit/scm.py b/legit/scm.py
@@ -157,7 +157,7 @@ def smart_merge(self, branch, allow_rebase=True):
             else:
                 verb = 'merge'
 
-        if self.pull_ff_only():
+        if verb != 'rebase' and self.pull_ff_only():
             return self.git_exec([verb, '--ff-only', branch])
         else:
             try:
@@ -177,7 +177,7 @@ def pull_rebase(self):
     def pull_ff_only(self):
         reader = self.repo.config_reader()
         if reader.has_option('pull', 'ff'):
-            if reader.getboolean('pull', 'ff') == 'only':
+            if reader.get('pull', 'ff') == 'only':
                 return True
             else:
                 return False