From: nbd Date: Tue, 2 Sep 2008 15:48:40 +0000 (+0000) Subject: fix ./scripts/env for newer git versions X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/5e0e6f254e643c042600e69053aa806e0d6245bf fix ./scripts/env for newer git versions git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12502 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/scripts/env b/scripts/env index 1aee4b323..e08869596 100755 --- a/scripts/env +++ b/scripts/env @@ -150,7 +150,6 @@ env_delete() { local name="${1##*/}" env_init [ -z "$name" ] && usage - [ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found" branch="$(git branch | grep '^\* ' | awk '{print $2}')" [ "$name" = "$branch" ] && error "cannot delete the currently selected environment" git branch -D "$name" @@ -159,11 +158,10 @@ env_delete() { env_switch() { local name="${1##*/}" [ -z "$name" ] && usage - [ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found" env_init env_ask_sync - git checkout "$name" + git checkout "$name" || error "environment '$name' not found" env_link_config }