From 6f6d039f0cfb7470d11f77cacb8612b1b4ed40d1 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 8 Nov 2006 17:35:50 +0000 Subject: [PATCH] Add file renaming support The merge method was changed from gitmergeonefile.merge() to the external git-merge-recursive which handles renames properly. The 'mv' command was added as well. Signed-off-by: Catalin Marinas --- stgit/git.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/stgit/git.py b/stgit/git.py index 2a6ae91..20cac61 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -515,8 +515,12 @@ def merge(base, head1, head2): local tree """ refresh_index() - if __run('git-read-tree -u -m --aggressive', [base, head1, head2]) != 0: - raise GitException, 'git-read-tree failed (local changes maybe?)' + + try: + # use _output() to mask the verbose prints of the tool + _output('git-merge-recursive %s -- %s %s' % (base, head1, head2)) + except GitException: + pass # check the index for unmerged entries files = {} -- 2.11.0