fix ./scripts/env for newer git versions

[openwrt/svn-archive/archive.git] / scripts / env

diff --git a/scripts/env b/scripts/env
index 1aee4b323b82b7565ef867aba36cb57152aa4b71..e08869596d3688e645b0380a46fba0b1e1e13e28 100755 (executable)
--- a/scripts/env
+++ b/scripts/env
@@ -150,7 +150,6 @@ env_delete() {
        local name="${1##*/}"
        env_init
        [ -z "$name" ] && usage
        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"
        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
 env_switch() {
        local name="${1##*/}"
        [ -z "$name" ] && usage

-       [ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found"

 
        env_init
        env_ask_sync
 
        env_init
        env_ask_sync

-       git checkout "$name"
+       git checkout "$name" || error "environment '$name' not found"

        env_link_config
 }
 
        env_link_config
 }