zuul
/
zuul
Code Issues Proposed changes

reset on origin/HEAD not master 

Some repositories might not have a master branch or could use a
different default HEAD. A git reset was made to remotes/master which
would produce a stacktrace.

Fix https://bugs.launchpad.net/zuul/+bug/1083154

Change-Id: Ie9390c0c5dd707d77fbfa8cff2078a9b31fd31ae
Reviewed-on: https://review.openstack.org/17239
Reviewed-by: Antoine Musso <hashar@free.fr>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Antoine Musso 2012-11-30 22:37:46 +01:00 committed by Jenkins
parent b4e809edf0
commit f2626eb384
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zuul/merger.py
View File

@ -54,7 +54,8 @@ class Repo(object):
continue continue
self.repo.create_head(ref.remote_head, ref, force=True) self.repo.create_head(ref.remote_head, ref, force=True)
self.repo.head.reference = self.repo.heads.master # Reset to remote HEAD (usually origin/master)
self.repo.head.reference = origin.refs['HEAD']
self.repo.head.reset(index=True, working_tree=True) self.repo.head.reset(index=True, working_tree=True)
self.repo.git.clean('-x', '-f', '-d') self.repo.git.clean('-x', '-f', '-d')