zuul
/
zuul
Code Issues Proposed changes

Merge "Fix checkout when preparing a ref"

This commit is contained in:
Jenkins 2013-08-27 22:37:33 +00:00 committed by Gerrit Code Review
parent 0f5efced1d 6eeb24743a
commit 99648b3b74
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zuul/merger.py
View File

@ -63,15 +63,13 @@ class Repo(object):
def checkout(self, ref):
self._ensure_cloned()
self.log.debug("Checking out %s" % ref)
self.log.debug(repr(ref))
if self.repo.re_hexsha_only.match(ref):
self.repo.head.reference = ref
else:
self.fetch(ref)
self.repo.head.reference = \
self.repo.remotes.origin.refs[ref].commit.hexsha
self.repo.head.reset(index=True, working_tree=True)
self.repo.git.clean('-x', '-f', '-d')
if self.repo.re_hexsha_only.match(ref):
self.repo.git.checkout(ref)
else:
self.fetch(ref)
self.repo.git.checkout("FETCH_HEAD")
def cherryPick(self, ref):
self._ensure_cloned()