Pass the --aggressive flag to git-read-tree

This flags solves the file removals which consumes the most time when
resolving the three-way merge conflicts.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/git.py b/stgit/git.py
index 351ebbdc7b176548bc3baf4c509c1f7b31001660..8306c851a55afefd1d24d216fdb831eca313b831 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -493,7 +493,7 @@ def merge(base, head1, head2):
     local tree
     """
     refresh_index()
-    if __run('git-read-tree -u -m', [base, head1, head2]) != 0:
+    if __run('git-read-tree -u -m --aggressive', [base, head1, head2]) != 0:
         raise GitException, 'git-read-tree failed (local changes maybe?)'
 
     # this can fail if there are conflicts