1
0
Fork 0

Autocommitted updated scripts from mari-wovn

main
Mari 5 years ago
parent 9a3409b001
commit 4772afd40a
  1. 6
      per-host/mari-wovn/.bash_aliases

@ -30,7 +30,7 @@ function _start_branch() {
cd ~/equalizer/master || exit "$?" cd ~/equalizer/master || exit "$?"
wovn_pull wovn_pull
printf "=== Checking out the branch named feature/${branch} in a new working tree at ~/equalizer/${branch}...\n" printf "=== Checking out the branch named feature/${branch} in a new working tree at ~/equalizer/${branch}...\n"
git worktree add -b "feature/${branch}" ../"${branch}" develop_front || git worktree add ../"${branch}" "feature/${branch}" || exit "$?" git worktree add ../"${branch}" "feature/${branch}" || git worktree add -b "feature/${branch}" ../"${branch}" develop_front || exit "$?"
else else
printf "=== Accessing an existing branch named ${branch}...\n" printf "=== Accessing an existing branch named ${branch}...\n"
fi fi
@ -118,13 +118,13 @@ function wovn_delete() {
set -o pipefail set -o pipefail
branch=${1:+feature/$1} branch=${1:+feature/$1}
branch=${branch:-$(get_current_branch_name)} || exit "$?" branch=${branch:-$(get_current_branch_name)} || exit "$?"
cd ~/equalizer.git cd ~/equalizer/master
worktree="$(git worktree list --porcelain | grep -B2 ${branch} | cut -d' ' -f2 | head -n1)" || exit "$?" worktree="$(git worktree list --porcelain | grep -B2 ${branch} | cut -d' ' -f2 | head -n1)" || exit "$?"
git worktree remove "$worktree" || exit "$?" git worktree remove "$worktree" || exit "$?"
git branch -d "$branch" || exit "$?" git branch -d "$branch" || exit "$?"
); local lastexit="$?" ); local lastexit="$?"
if [[ ! -d "$PWD" ]]; then if [[ ! -d "$PWD" ]]; then
cd ~/equalizer.git cd ~/equalizer/master
fi fi
return $lastexit return $lastexit
} }

Loading…
Cancel
Save