From 4772afd40a19a8b9bea0180ffb05caa36a07b829 Mon Sep 17 00:00:00 2001 From: Mari Date: Fri, 15 May 2020 14:27:22 -0400 Subject: [PATCH] Autocommitted updated scripts from mari-wovn --- per-host/mari-wovn/.bash_aliases | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/per-host/mari-wovn/.bash_aliases b/per-host/mari-wovn/.bash_aliases index c91e348..cec9114 100644 --- a/per-host/mari-wovn/.bash_aliases +++ b/per-host/mari-wovn/.bash_aliases @@ -30,7 +30,7 @@ function _start_branch() { cd ~/equalizer/master || exit "$?" wovn_pull 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 printf "=== Accessing an existing branch named ${branch}...\n" fi @@ -118,13 +118,13 @@ function wovn_delete() { set -o pipefail branch=${1:+feature/$1} 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 "$?" git worktree remove "$worktree" || exit "$?" git branch -d "$branch" || exit "$?" ); local lastexit="$?" if [[ ! -d "$PWD" ]]; then - cd ~/equalizer.git + cd ~/equalizer/master fi return $lastexit }