zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix updating a git working copy when the head is detached

Browse source
This commit is contained in:
Pierre Labastie 2013-09-22 07:14:33 +00:00
parent b86876a6ef
commit 7ce6de2ee4
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/libs/func_book_parser
View file

@ -31,12 +31,17 @@ get_book() { #
if [ ! $TREE == "development" ]; then if [ ! $TREE == "development" ]; then
cd ${PROGNAME}-$LFSVRS cd ${PROGNAME}-$LFSVRS
echo "Checking out $LFSVRS at $PWD in $TREE" 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 fi
else else
cd ${PROGNAME}-$LFSVRS cd ${PROGNAME}-$LFSVRS
case $PROGNAME in 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 ;; lfs | hlfs) svn up >>$LOGDIR/$LOG 2>&1 ;;
*) ;; *) ;;
esac esac