From 0d5918f8e4d1bedd8d1d8de1e475fa2a83eb4942 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 10 Apr 2012 09:17:24 -0700 Subject: [PATCH] kernel: reset to remote firmware branch; don't pull Pull might merge if upstream rebases. Just make our branch match the remote one. --- teuthology/task/kernel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py index 6f3bb34b5a5d6..e2a560e26cb37 100644 --- a/teuthology/task/kernel.py +++ b/teuthology/task/kernel.py @@ -121,7 +121,9 @@ def install_firmware(ctx, config): args=[ 'cd', fw_dir, run.Raw('&&'), - 'sudo', 'git', 'pull', 'origin', 'master' + 'sudo', 'git', 'fetch', 'origin', + run.Raw('&&'), + 'sudo', 'git', 'reset', '--hard', 'origin/master' ], ) -- 2.39.5