Skip to content
Snippets Groups Projects
Commit 875822ee authored by Richard Hartmann's avatar Richard Hartmann
Browse files

Minor cleanups

parent 3ad6e99b
Branches
Tags
No related merge requests found
...@@ -40,12 +40,12 @@ use() { ...@@ -40,12 +40,12 @@ use() {
init() { init() {
[[ -e $GIT_DIR ]] && [[ -e $GIT_DIR ]] &&
echo "$(basename $0): fatal: $GIT_DIR exists" && echo "$SELF: fatal: $GIT_DIR exists" &&
return 21 return 21
export GIT_WORK_TREE="$HOME" export GIT_WORK_TREE="$HOME"
mkdir -p $GIT_WORK_TREE mkdir -p $GIT_WORK_TREE
cd $GIT_WORK_TREE || cd $GIT_WORK_TREE ||
(echo "$(basename $0): fatal: could not enter $GIT_WORK_TREE" && (echo "$SELF: fatal: could not enter $GIT_WORK_TREE" &&
exit 20) || exit 20 exit 20) || exit 20
cd $GIT_WORK_TREE cd $GIT_WORK_TREE
git init git init
...@@ -80,7 +80,7 @@ elif [ "$1" = 'use' ]; then ...@@ -80,7 +80,7 @@ elif [ "$1" = 'use' ]; then
if [[ -o NO_IGNORE_EOF ]]; then if [[ -o NO_IGNORE_EOF ]]; then
export VCSH_NO_IGNORE_EOF=1 export VCSH_NO_IGNORE_EOF=1
setopt IGNORE_EOF setopt IGNORE_EOF
vcsh_exit() {vcsh exit; zle reset-prompt} vcsh_exit() {vcsh exit; zle reset-prompt;}
zle -N vcsh_exit zle -N vcsh_exit
bindkey '^d' 'vcsh_exit' bindkey '^d' 'vcsh_exit'
fi fi
...@@ -102,11 +102,11 @@ elif [ "$1" = 'clone' ]; then ...@@ -102,11 +102,11 @@ elif [ "$1" = 'clone' ]; then
git fetch git fetch
for i in $(git ls-tree -r origin/master | awk '{print $4}'); do for i in $(git ls-tree -r origin/master | awk '{print $4}'); do
[[ -e $i ]] && [[ -e $i ]] &&
echo "$(basename $0): error: $i exists." && echo "$SELF: error: $i exists." &&
CONFLICT=1; CONFLICT=1;
done done
[[ -n $CONFLICT ]] && [[ -n $CONFLICT ]] &&
echo "$(basename $0): fatal: will stop after fetching and not try to merge!\n" && echo "$SELF: fatal: will stop after fetching and not try to merge!\n" &&
exit 3 exit 3
git merge origin/master git merge origin/master
vcsh use $REPO_NAME vcsh use $REPO_NAME
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment