Fix GitPoller using peeled tags in the ls-remote output

buildbot · Sep 25, 2017 · fce8e85 · fce8e85
1 parent 1b0d355
commit fce8e85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/master/buildbot/changes/gitpoller.py b/master/buildbot/changes/gitpoller.py
@@ -135,7 +135,7 @@ def describe(self):
         return str
 
     def _getBranches(self):
-        d = self._dovccmd('ls-remote', [self.repourl])
+        d = self._dovccmd('ls-remote', ['--refs', self.repourl])
 
         @d.addCallback
         def parseRemote(rows):

diff --git a/master/buildbot/test/unit/test_changes_gitpoller.py b/master/buildbot/test/unit/test_changes_gitpoller.py
@@ -706,7 +706,7 @@ def comments(rev):
     def test_poll_allBranches_single(self):
         self.expectCommands(
             gpo.Expect(b'git', b'init', b'--bare', b'gitpoller-work'),
-            gpo.Expect(b'git', b'ls-remote', self.REPOURL)
+            gpo.Expect(b'git', b'ls-remote', b'--refs', self.REPOURL)
             .stdout(b'4423cdbcbb89c14e50dd5f4152415afd686c5241\t'
                     b'refs/heads/master\n'),
             gpo.Expect(b'git', b'fetch', self.REPOURL,
@@ -819,7 +819,7 @@ def cb(_):
     def test_poll_allBranches_multiple(self):
         self.expectCommands(
             gpo.Expect(b'git', b'init', b'--bare', b'gitpoller-work'),
-            gpo.Expect(b'git', b'ls-remote', self.REPOURL)
+            gpo.Expect(b'git', b'ls-remote', b'--refs', self.REPOURL)
             .stdout(b'\n'.join([
                 b'4423cdbcbb89c14e50dd5f4152415afd686c5241\trefs/heads/master',
                 b'9118f4ab71963d23d02d4bdc54876ac8bf05acf2\trefs/heads/release',
@@ -920,7 +920,7 @@ def cb(_):
     def test_poll_callableFilteredBranches(self):
         self.expectCommands(
             gpo.Expect(b'git', b'init', b'--bare', b'gitpoller-work'),
-            gpo.Expect(b'git', b'ls-remote', self.REPOURL)
+            gpo.Expect(b'git', b'ls-remote', b'--refs', self.REPOURL)
             .stdout(b'\n'.join([
                 b'4423cdbcbb89c14e50dd5f4152415afd686c5241\trefs/heads/master',
                 b'9118f4ab71963d23d02d4bdc54876ac8bf05acf2\trefs/heads/release',
@@ -1010,7 +1010,7 @@ def cb(_):
     def test_poll_branchFilter(self):
         self.expectCommands(
             gpo.Expect(b'git', b'init', b'--bare', b'gitpoller-work'),
-            gpo.Expect(b'git', b'ls-remote', self.REPOURL)
+            gpo.Expect(b'git', b'ls-remote', b'--refs', self.REPOURL)
             .stdout(b'\n'.join([
                 b'4423cdbcbb89c14e50dd5f4152415afd686c5241\t'
                 b'refs/pull/410/merge',
@@ -1190,7 +1190,7 @@ def check_changes(_):
     def test_poll_callableCategory(self):
         self.expectCommands(
             gpo.Expect(b'git', b'init', b'--bare', b'gitpoller-work'),
-            gpo.Expect(b'git', b'ls-remote', self.REPOURL)
+            gpo.Expect(b'git', b'ls-remote', b'--refs', self.REPOURL)
             .stdout(b'4423cdbcbb89c14e50dd5f4152415afd686c5241\t'
                     b'refs/heads/master\n'),
             gpo.Expect(b'git', b'fetch', self.REPOURL,