diff options
| author | Andrea Galbusera <gizero@gmail.com> | 2017-07-31 11:19:17 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-09 09:24:03 +0100 |
| commit | 0dcdb146f59a184419bffd4f24cdf8343a43c0ea (patch) | |
| tree | 7ccc49c0ce969b5b65ee6bf007dcae0dd9bd9b3d | |
| parent | 1849ce3bd7c0af055f3e849a6508e746b6a0dca5 (diff) | |
| download | openembedded-core-0dcdb146f59a184419bffd4f24cdf8343a43c0ea.tar.gz openembedded-core-0dcdb146f59a184419bffd4f24cdf8343a43c0ea.tar.bz2 openembedded-core-0dcdb146f59a184419bffd4f24cdf8343a43c0ea.zip | |
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 <gizero@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | scripts/lib/devtool/sdk.py | 2 |
1 files changed, 1 insertions, 1 deletions
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); |