1 files changed, 11 insertions, 11 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 0ac1572471..9209f423cf 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -200,11 +200,20 @@ do_kernel_checkout() {
         fi
         # end debare
 
+        # convert any remote branches to local tracking ones
+        for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
+                b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
+                git show-ref --quiet --verify -- "refs/heads/$b"
+                if [ $? -ne 0 ]; then
+                        git branch $b $i > /dev/null
+                fi
+        done
+
         # If KMETA is defined, the branch must exist, but a machine branch
         # can be missing since it may be created later by the tools.
         if [ -n "${KMETA}" ]; then
-                git branch -a --no-color | grep -q ${KMETA}
-                if [ $? -ne 0 ]; then
+                git show-ref --quiet --verify -- "refs/heads/${KMETA}"
+                if [ $? -eq 1 ]; then
                         echo "ERROR. The branch '${KMETA}' is required and was not"
                         echo "found. Ensure that the SRC_URI points to a valid linux-yocto"
                         echo "kernel repository"
@@ -214,15 +223,6 @@ do_kernel_checkout() {
         
         machine_branch="${@ get_machine_branch(d, "${KBRANCH}" )}"
 
-        # convert any remote branches to local tracking ones
-        for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
-                b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
-                git show-ref --quiet --verify -- "refs/heads/$b"
-                if [ $? -ne 0 ]; then
-                        git branch $b $i > /dev/null
-                fi
-        done
-
         # Create a working tree copy of the kernel by checking out a branch
         git show-ref --quiet --verify -- "refs/heads/${machine_branch}"
         if [ $? -eq 0 ]; then