X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/1c7ec34aa2c1faefe2cc96df094e427e3ef83376..bebf97964dd6f84c3cb10878bd24973a164da9ef:/vcs.py diff --git a/vcs.py b/vcs.py index b700b6e..9c91e93 100644 --- a/vcs.py +++ b/vcs.py @@ -36,13 +36,13 @@ class Git: branch = repo.heads[branchname] else: branch = repo.create_head(branchname, self.commit) - if isBranch: + if isBranch: # track remote branch branch.set_tracking_branch(origin.refs[branchname]) # update it to the latest remote commit branch.checkout() repo.git.rebase(self.commit) print "...done", - if repo.head.reference.commit != repo.refs[self.commit].commit: + if repo.head.reference.commit != repo.commit(self.commit): print "(keeping local patches around)", print