Fix GitPoller setting invalid branch (PR #1069)

buildbot · Apr 19, 2014 · 4314678 · 4314678
2 parents f0bcdb2 + 9101ef0
commit 4314678
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/master/buildbot/changes/gitpoller.py b/master/buildbot/changes/gitpoller.py
@@ -281,7 +281,7 @@ def _process_changes(self, newRev, branch):
                 files=files,
                 comments=comments,
                 when_timestamp=epoch2datetime(timestamp),
-                branch=branch,
+                branch=self._removeHeads(branch),
                 category=self.category,
                 project=self.project,
                 repository=self.repourl,

diff --git a/master/buildbot/test/unit/test_changes_gitpoller.py b/master/buildbot/test/unit/test_changes_gitpoller.py
@@ -498,8 +498,7 @@ def cb(_):
             self.assertEqual(self.changes_added[0]['when_timestamp'],
                              epoch2datetime(1273258009))
             self.assertEqual(self.changes_added[0]['comments'], 'hello!')
-            self.assertEqual(self.changes_added[0]['branch'],
-                             'refs/heads/master')
+            self.assertEqual(self.changes_added[0]['branch'], 'master')
             self.assertEqual(self.changes_added[0]['files'], ['/etc/442'])
             self.assertEqual(self.changes_added[0]['src'], 'git')
 
@@ -631,8 +630,7 @@ def cb(_):
             self.assertEqual(self.changes_added[0]['when_timestamp'],
                              epoch2datetime(1273258009))
             self.assertEqual(self.changes_added[0]['comments'], 'hello!')
-            self.assertEqual(self.changes_added[0]['branch'],
-                             'refs/heads/master')
+            self.assertEqual(self.changes_added[0]['branch'], 'master')
             self.assertEqual(self.changes_added[0]['files'], ['/etc/442'])
             self.assertEqual(self.changes_added[0]['src'], 'git')
 
@@ -729,8 +727,7 @@ def cb(_):
             self.assertEqual(self.changes_added[0]['when_timestamp'],
                              epoch2datetime(1273258009))
             self.assertEqual(self.changes_added[0]['comments'], 'hello!')
-            self.assertEqual(self.changes_added[0]['branch'],
-                             'refs/heads/master')
+            self.assertEqual(self.changes_added[0]['branch'], 'master')
             self.assertEqual(self.changes_added[0]['files'], ['/etc/442'])
             self.assertEqual(self.changes_added[0]['src'], 'git')
 

diff --git a/master/docs/relnotes/index.rst b/master/docs/relnotes/index.rst
@@ -194,6 +194,8 @@ Refer to the documentation for previous versions for infrormation on old-style s
 Fixes
 ~~~~~
 
+* Fixes an issue where :bb:chsrc:`GitPoller` sets the change branch to ``refs/heads/master`` - which isn't compatible with :bb:step:`Git` (:bb:pull:`1069`).
+
 * Fixed an issue where the :bb:step:`Git` and :bb:step:`CVS` source steps silently changed the ``workdir`` to ``'build'`` when the 'copy' method is used.
 
 * The :bb:step:`CVS` source step now respects the timeout parameter.