commit 8dda7c15202a76412d7266dbc4ea79d5c6aea339
author Jenkins <jenkins@review.openstack.org> Thu Sep 08 18:07:05 2016 +0000
committer Gerrit Code Review <review@openstack.org> Thu Sep 08 18:07:05 2016 +0000
tree f7e1feccf7b51e5f28ec3748dace1ab13f6e5ad7
parent aba3258b4e60a16a9e12ca37ca09bcec77cc2e6d
parent b8a7792977bfe1e2ea052b57d793611815452a18

Merge "Handle non-valid HEAD"

zuul/merger/merger.py

diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py
index 0c9f168..b3cfaca 100644
--- a/zuul/merger/merger.py
+++ b/zuul/merger/merger.py
@@ -95,8 +95,12 @@
                 continue
             repo.create_head(ref.remote_head, ref, force=True)
 
-        # Reset to remote HEAD (usually origin/master)
-        repo.head.reference = origin.refs['HEAD']
+        # try reset to remote HEAD (usually origin/master)
+        # If it fails, pick the first reference
+        try:
+            repo.head.reference = origin.refs['HEAD']
+        except IndexError:
+            repo.head.reference = origin.refs[0]
         reset_repo_to_head(repo)
         repo.git.clean('-x', '-f', '-d')