X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/b8fb01b798441403be79fb586f2ece3a5578214e..6c0b914e81cc002d48479074dffe903bf6170a87:/vcs.py

diff --git a/vcs.py b/vcs.py
index c1068fb..acb23e8 100644
--- a/vcs.py
+++ b/vcs.py
@@ -32,9 +32,9 @@ def get_non_digit_prefix(val):
 
 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))
@@ -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)
-			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:
@@ -90,8 +90,7 @@ class Git:
 		print()
 
 	def version(self):
-		repo = git.Repo(self.folder)
-		v = repo.git.describe()
+		v = git.describe(split=False)
 		return v[len(get_non_digit_prefix(v)):] # remove the non-digit prefix from v (so that it starts with a number)
 
 	def checkVersions(self):