Pass -q to git-merge-cache

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index fd64ca5c6a6305d4792ea17eeb7a3d52afbec3d3..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
-    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,
@@ -457,18 +457,16 @@ def reset(tree_id = None):
     # checkout doesn't remove files
     map(os.remove, rm_files)
 
-def pull(location, head = None, tag = None):
-    """Fetch changes from the remote repository. At the moment, just
-    use the 'git fetch' scripts
+def pull(repository = 'origin', refspec = None):
+    """Pull changes from the remote repository. At the moment, just
+    use the 'git pull' command
     """
-    args = [location]
-    if head:
-        args += [head]
-    elif tag:
-        args += ['tag', tag]
+    args = [repository]
+    if refspec:
+        args.append(refspec)
 
     if __run('git pull', args) != 0:
-        raise GitException, 'Failed "git fetch %s"' % location
+        raise GitException, 'Failed "git pull %s"' % repository
 
 def apply_patch(filename = None):
     """Apply a patch onto the current index. There must not be any