fix ./scripts/env for newer git versions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12502 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
0fb2200b5e
commit
efaf261162
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue