git: suppress stderr when switching branches

diff --git a/vcs.py b/vcs.py
index c1068fb73bec0b95ecc896199c48033844be5840..14944788a5b7b2259fd7ae07618f16d7dc17e959 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -32,9 +32,9 @@ def get_non_digit_prefix(val):
 
 class GitCommand:
        def __getattr__(self, name):
 
 class GitCommand:
        def __getattr__(self, name):

-               def call(*args, split = True):
+               def call(*args, suppress_stderr = False, split = True):

                        cmd = ["git", name.replace('_', '-')] + list(args)
                        cmd = ["git", name.replace('_', '-')] + list(args)

-                       with subprocess.Popen(cmd, stdout=subprocess.PIPE) as p:
+                       with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE if suppress_stderr else None) as p:

                                (stdout, stderr) = p.communicate()
                                if p.returncode != 0:
                                        raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode))
                                (stdout, stderr) = p.communicate()
                                if p.returncode != 0:
                                        raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode))


@@ -73,10 +73,10 @@ class Git:
                # create/find correct branch
                if not git.branch("--list", branchname): # the branch does not yet exit
                        git.branch(branchname, self.commit)
                # create/find correct branch
                if not git.branch("--list", branchname): # the branch does not yet exit
                        git.branch(branchname, self.commit)

-                       if isBranch: # make sure we track remote branch
+                       if isBranch: # make sure we track the correct remote branch

                                git.branch("-u", self.commit, branchname)
                # update it to the latest remote commit
                                git.branch("-u", self.commit, branchname)
                # update it to the latest remote commit

-               git.checkout(branchname)
+               git.checkout(branchname, suppress_stderr=True)

                if mode == MODE_RESET:
                        git.reset("--hard", self.commit)
                else:
                if mode == MODE_RESET:
                        git.reset("--hard", self.commit)
                else: