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)
- 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))
# 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.checkout(branchname)
+ git.checkout(branchname, suppress_stderr=True)
if mode == MODE_RESET:
git.reset("--hard", self.commit)
else: