fix logic
This commit is contained in:
parent
b6cecd1dc2
commit
71edfe6e6b
2 changed files with 2 additions and 2 deletions
|
@ -150,7 +150,7 @@ if [[ $- = *i* ]] ; then
|
||||||
[ -z "${MYSHELLCONFIG_GIT_REMOTE_NAME+x}" ] && export MYSHELLCONFIG_GIT_REMOTE_NAME=origin
|
[ -z "${MYSHELLCONFIG_GIT_REMOTE_NAME+x}" ] && export MYSHELLCONFIG_GIT_REMOTE_NAME=origin
|
||||||
[ -z "${MYSHELLCONFIG_GIT_BRANCH+x}" ] && export MYSHELLCONFIG_GIT_BRANCH=master
|
[ -z "${MYSHELLCONFIG_GIT_BRANCH+x}" ] && export MYSHELLCONFIG_GIT_BRANCH=master
|
||||||
# If TAG is set, checkout is always headless.
|
# If TAG is set, checkout is always headless.
|
||||||
[ -z "${MYSHELLCONFIG_GIT_TAG:+x}" ] && { export MYSHELLCONFIG_GIT_BRANCH=${MYSHELLCONFIG_GIT_TAG}; export MYSHELLCONFIG_GIT_CHECKOUTSCRIPT_OPTIONS=""; }
|
[ -z "${MYSHELLCONFIG_GIT_TAG:+x}" ] || { export MYSHELLCONFIG_GIT_BRANCH=${MYSHELLCONFIG_GIT_TAG}; export MYSHELLCONFIG_GIT_CHECKOUTSCRIPT_OPTIONS=""; }
|
||||||
|
|
||||||
#GIT_SSH_PATH="/srv/repos"
|
#GIT_SSH_PATH="/srv/repos"
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ case $1 in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
# If TAG is set, checkout is always headless.
|
# If TAG is set, checkout is always headless.
|
||||||
[ -z "${MYSHELLCONFIG_GIT_TAG:+x}" ] && { export MYSHELLCONFIG_GIT_BRANCH=${MYSHELLCONFIG_GIT_TAG}; export PRE=""; }
|
[ -z "${MYSHELLCONFIG_GIT_TAG:+x}" ] || { export MYSHELLCONFIG_GIT_BRANCH=${MYSHELLCONFIG_GIT_TAG}; export PRE=""; }
|
||||||
|
|
||||||
# Output
|
# Output
|
||||||
echo -n " remote: ${MYSHELLCONFIG_GIT_REMOTE_NAME}, branch: ${MYSHELLCONFIG_GIT_BRANCH}: "
|
echo -n " remote: ${MYSHELLCONFIG_GIT_REMOTE_NAME}, branch: ${MYSHELLCONFIG_GIT_BRANCH}: "
|
||||||
|
|
Loading…
Reference in a new issue