From 1495b55d8ee0f848421fb8ac3103b2308b04860c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=B6glund?= <jonas.hoglund@embeddednation.com>
Date: Wed, 29 Mar 2017 12:01:06 +0200
Subject: [PATCH] Fix local repo checkout bug

---
 iop/scripts/extract_core.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iop/scripts/extract_core.sh b/iop/scripts/extract_core.sh
index 76f26e5b0..33c50d84b 100755
--- a/iop/scripts/extract_core.sh
+++ b/iop/scripts/extract_core.sh
@@ -47,7 +47,7 @@ function extract_core {
 		mkdir -p patches
 		repo=$(basename $path)
 		dir=$(dirname $path)
-		git format-patch $initial_commit $path -o patches #> /dev/null
+		git format-patch $initial_commit $path -o patches
 
 		# Remove dirname from patches to commit the packages to the
 		# top directory in the destination repo.
@@ -67,7 +67,7 @@ function extract_core {
 			
 			# Rebase and merge.
 			git rebase origin/$repo
-			git checkout $repo
+			git checkout --track -b $repo origin/$repo
 			git merge tmp
 			git br -d tmp
 		else