[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7096/8267] devtool: sdk-update: fix pulling updates from git

[Emmanuele Bassi <ebassi src gnome org>]

commit 6346d12d8df311526f6fc625f34ee6b222d8dc8d
Author: Andrea Galbusera <gizero gmail com>
Date:   Mon Jul 31 11:19:17 2017 +0200

    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.
    
    (From OE-Core rev: 0dcdb146f59a184419bffd4f24cdf8343a43c0ea)
    
    Signed-off-by: Andrea Galbusera <gizero gmail com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 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 e8bf0ad..f46577c 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);