From 101239d59905d3a747ec0da1d09127ff953fe42d Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 14 Sep 2005 15:38:02 +0100 Subject: [PATCH] Pass -q to git-merge-cache The error reporting is handled by gitmergeonefile.py Signed-off-by: Catalin Marinas --- stgit/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stgit/git.py b/stgit/git.py index e4aacd5..bdc0e14 100644 --- a/stgit/git.py +++ b/stgit/git.py @@ -346,7 +346,7 @@ def merge(base, head1, head2): raise GitException, 'git-read-tree failed (local changes maybe?)' # this can fail if there are conflicts - if os.system('git-merge-cache -o gitmergeonefile.py -a') != 0: + if os.system('git-merge-cache -o -q gitmergeonefile.py -a') != 0: raise GitException, 'git-merge-cache failed (possible conflicts)' def status(files = [], modified = False, new = False, deleted = False, -- 2.11.0