Don't always use git-merge-recursive because of speed

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index e650713d3565597496560c7676ea6fb5affe87f0..33010d9b90c164680c71b2fd00396c1218b162b7 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -933,7 +933,7 @@ class Series(StgitObject):
 
                 # merge can fail but the patch needs to be pushed
                 try:
-                    git.merge(bottom, head, top)
+                    git.merge(bottom, head, top, recursive = True)
                 except git.GitException, ex:
                     print >> sys.stderr, \
                           'The merge failed during "push". ' \