Pass -q to git-merge-cache

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index e4aacd59f96af67fd079124c63ead292622f1e69..bdc0e14f4fd764c293625453c4881babde853d66 100644 (file)
--- 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
         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,
         raise GitException, 'git-merge-cache failed (possible conflicts)'
 
 def status(files = [], modified = False, new = False, deleted = False,