From 0dcdb146f59a184419bffd4f24cdf8343a43c0ea Mon Sep 17 00:00:00 2001 From: Andrea Galbusera Date: Mon, 31 Jul 2017 11:19:17 +0200 Subject: devtool: sdk-update: fix pulling updates from git Commit 4657bc9d165e51981e034e73e7b92552e873eef7 replaced the git pull logic with the git fetch + git reset --hard combo, but resetting to HEAD does not really pull in new commits from remote... Replace with resetting to the upstream branch instead. Signed-off-by: Andrea Galbusera Signed-off-by: Ross Burton --- scripts/lib/devtool/sdk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lib/devtool/sdk.py') diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index e8bf0ad98c..f46577c2ab 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py @@ -155,7 +155,7 @@ def sdk_update(args, config, basepath, workspace): if os.path.exists(os.path.join(basepath, 'layers/.git')): out = subprocess.check_output("git status --porcelain", shell=True, cwd=layers_dir) if not out: - ret = subprocess.call("git fetch --all; git reset --hard", shell=True, cwd=layers_dir) + ret = subprocess.call("git fetch --all; git reset --hard @{u}", shell=True, cwd=layers_dir) else: logger.error("Failed to update metadata as there have been changes made to it. Aborting."); logger.error("Changed files:\n%s" % out); -- cgit 1.2.3-korg