[StGit PATCH 2/6] Don't try to merge files that merge-recursive already merged
From: David Kågedal <hidden>
Date: 2016-06-15 22:43:30
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: David KÃ¥gedal <redacted> This avoid duplicating work, but also changes the resulting index state so that the conflicts are left in the index in the three stages. Signed-off-by: David KÃ¥gedal <redacted> --- stgit/git.py | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/stgit/git.py b/stgit/git.py
index 9d8da5d..5e1548c 100644
--- a/stgit/git.py
+++ b/stgit/git.py@@ -707,25 +707,7 @@ def merge_recursive(base, head1, head2): # error and we have to abort the merge raise GitException, err_output - # merge the unmerged files - errors = False - for path in files: - # remove additional files that might be generated for some - # newer versions of GIT - for suffix in [base, head1, head2]: - if not suffix: - continue - fname = path + '~' + suffix - if os.path.exists(fname): - os.remove(fname) - - stages = files[path] - if gitmergeonefile.merge(stages['1'][1], stages['2'][1], - stages['3'][1], path, stages['1'][0], - stages['2'][0], stages['3'][0]) != 0: - errors = True - - if errors: + if files: raise GitException, 'GIT index merging failed (possible conflicts)' def merge(base, head1, head2):
--
1.5.3.rc3.119.g1812