diff --git a/bin/git-myshellconfig-checkout b/bin/git-myshellconfig-checkout index 8faca2d..068204c 100755 --- a/bin/git-myshellconfig-checkout +++ b/bin/git-myshellconfig-checkout @@ -18,7 +18,7 @@ #MSC_LOGFILE="${MSC_LOGDIR}/git.log" [ -d "${MSC_LOGDIR}" ] || mkdir -p "${MSC_LOGDIR}" [ -z "${MSC_GIT_REMOTE_NAME+x}" ] && export MSC_GIT_REMOTE_NAME=origin -[ -z "${MSC_GIT_BRANCH+x}" ] && export MSC_GIT_BRANCH=master +[ -z "${MSC_GIT_BRANCH:+x}" ] && export MSC_GIT_BRANCH=master @@ -100,7 +100,7 @@ if $dorepoupdate; then if $SGIT diff-index --ignore-submodules --exit-code HEAD -- >> "${MSC_LOGFILE}" ; then cat << EOF >> "${MSC_LOGFILE}" no changes in local repo - $SGIT checkout repo ${PRE}${PRE:+/}${MSC_GIT_BRANCH} + $SGIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} EOF $SGIT checkout ${PRE}${PRE:+/}${MSC_GIT_BRANCH} 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 2; } $SGIT merge FETCH_HEAD 1>>"${MSC_LOGFILE}" 2>>"${MSC_LOGFILE}"|| { gitupdateend; exit 3; }