From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 14 Sep 2005 14:38:02 +0000 (+0100)
Subject: Pass -q to git-merge-cache
X-Git-Tag: v0.7~33
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/101239d59905d3a747ec0da1d09127ff953fe42d?ds=sidebyside

Pass -q to git-merge-cache

The error reporting is handled by gitmergeonefile.py

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

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,