[Buildbot-commits] [Buildbot] #2127: Git 1.7.7: Recent change causes buildbot to always fail to fetch from git

[Buildbot]

#2127: Git 1.7.7: Recent change causes buildbot to always fail to fetch from git
---------------------+------------------------
Reporter:  cdavis5x  |       Owner:
    Type:  defect    |      Status:  closed
Priority:  critical  |   Milestone:  undecided
 Version:  master    |  Resolution:  fixed
Keywords:  git       |
---------------------+------------------------

Comment (by mattock):

 I backported this patch to buildbot 0.7.12 manually, but unfortunately it
 did not fix the problem. What did seem to fix this was skipping the ''git
 branch -M master'' step conditionally:

 {{{
     def _didFetch(self, res):
         if self.revision:
             head = self.revision
         else:
             head = 'FETCH_HEAD'

         # That is not sufficient. git will leave unversioned files and
 empty
         # directories. Clean them up manually in _didReset.
         command = ['reset', '--hard', head]
         if self.branch == "master":
             return self._dovccmd(command, self._initSubmodules)
         else:
             return self._dovccmd(command, self._didHeadCheckout)
 }}}

 Didn't look deep enough in the code to know if this has some unwanted
 side-effects.

-- 
Ticket URL: <http://trac.buildbot.net/ticket/2127#comment:2>
Buildbot <http://buildbot.net/>
Buildbot: build/test automation