From d928c71bca11555fad6f225e667808baba4e4947 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Sun, 22 Sep 2013 07:17:17 +0000
Subject: [PATCH] Merge trunk r3726

---
 common/libs/func_book_parser | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index e5d3024..c653b41 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -31,12 +31,17 @@ get_book() {                 #
         if [ ! $TREE == "development" ]; then
            cd ${PROGNAME}-$LFSVRS
            echo "Checking out $LFSVRS at $PWD in $TREE"
-           git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
+           git checkout -b ${TREE} ${TREE} >>$LOGDIR/$LOG 2>&1
         fi
     else
       cd ${PROGNAME}-$LFSVRS
       case $PROGNAME in
-        clfs*)  git pull >>$LOGDIR/$LOG 2>&1 ;;
+        clfs*)  git checkout master >>$LOGDIR/$LOG 2>&1
+                git pull >>$LOGDIR/$LOG 2>&1
+                if [ ! $TREE == "development" ]; then
+                   git checkout ${TREE} >>$LOGDIR/$LOG 2>&1
+                fi
+        ;;
         lfs | hlfs) svn up >>$LOGDIR/$LOG 2>&1 ;;
         *) ;;
       esac