Commit b5e86853 authored by Julien Muchembled's avatar Julien Muchembled

testnode: handle forced ref updates

parent 51885781
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment