From: David KÃ¥gedal <davidk@xxxxxxxxxxxxxx>
Listing the unmerged files is unnecessary, since the information
isn't really used anyway. Just note if the merge failed or succeeded.
Signed-off-by: David KÃ¥gedal <davidk@xxxxxxxxxxxxxx>
---
stgit/git.py | 33 ++-------------------------------
1 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/stgit/git.py b/stgit/git.py
index 5e1548c..63798bd 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -675,39 +675,10 @@ def merge_recursive(base, head1, head2):
"""
refresh_index()
- err_output = None
- # this operation tracks renames but it is slower (used in
- # general when pushing or picking patches)
+ # use _output() to mask the verbose prints of the tool
try:
- # use _output() to mask the verbose prints of the tool
_output(['git-merge-recursive', base, '--', head1, head2])
- except GitException, ex:
- err_output = str(ex)
- pass
-
- # check the index for unmerged entries
- files = {}
-
- for line in _output(['git-ls-files', '--unmerged', '--stage', '-z']).split('\0'):
- if not line:
- continue
-
- mode, hash, stage, path = stages_re.findall(line)[0]
-
- if not path in files:
- files[path] = {}
- files[path]['1'] = ('', '')
- files[path]['2'] = ('', '')
- files[path]['3'] = ('', '')
-
- files[path][stage] = (mode, hash)
-
- if err_output and not files:
- # if no unmerged files, there was probably a different type of
- # error and we have to abort the merge
- raise GitException, err_output
-
- if files:
+ except GitException:
raise GitException, 'GIT index merging failed (possible conflicts)'
def merge(base, head1, head2):
--
1.5.3.rc3.119.g1812
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
