testnode: handle forced ref updates

erp5/util/testnode/Updater.py

@@ -194,7 +194,8 @@ class Updater(object):
         if os.path.exists('.git/svn'):
           self._git('svn', 'rebase')
         else:
-          self._git('pull', '--ff-only')
+          self._git('fetch')
+          self._git('reset', '--merge', '@{u}')
         self.revision = self._git_find_rev(self._git('rev-parse', 'HEAD'))
     elif self.getRepositoryType() == SVN_TYPE:
       # following code allows sparse checkout