Do not use pull --rebase.

No local commit is supposed to exist.

Do not use pull --rebase.
No local commit is supposed to exist.
f6185914 · Vincent Pelletier · Kazuhiko Shiozaki · a6913d9f · f6185914
Commit f6185914 authored May 25, 2012 by Vincent Pelletier Committed by Kazuhiko Shiozaki Jun 07, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

slapos/recipe/testnode/profile_testnode.py slapos/recipe/testnode/profile_testnode.py +2 -2

No files found.
--- a/slapos/recipe/testnode/profile_testnode.py
+++ b/slapos/recipe/testnode/profile_testnode.py
@@ -126,8 +126,8 @@ def run(args):
          subprocess.check_call([config['git_binary'], 'checkout', '--force',
            '--track', '-b', config['branch'], 'origin/'+config['branch']],
            cwd=repository_clone)
-        subprocess.check_call([config['git_binary'], 'pull', '--rebase'],
-            cwd=repository_clone)
+        subprocess.check_call([config['git_binary'], 'reset', '--hard',
+          '@{upstream}'], cwd=repository_clone)
      except Exception:
        print 'Retrying git in 60s'
        time.sleep(60)