domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ./scripts/env for newer git versions

Browse Source 
SVN-Revision: 12502
This commit is contained in:
Felix Fietkau
2008-09-02 15:48:40 +00:00
parent 081d16fed0
commit 973d7e80d7
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/env
View File

@@ -150,7 +150,6 @@ env_delete() {
local name="${1##*/}" local name="${1##*/}"
env_init env_init
[ -z "$name" ] && usage [ -z "$name" ] && usage
[ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found"
branch="$(git branch | grep '^\* ' | awk '{print $2}')" branch="$(git branch | grep '^\* ' | awk '{print $2}')"
[ "$name" = "$branch" ] && error "cannot delete the currently selected environment" [ "$name" = "$branch" ] && error "cannot delete the currently selected environment"
git branch -D "$name" git branch -D "$name"
@@ -159,11 +158,10 @@ env_delete() {
env_switch() { env_switch() {
local name="${1##*/}" local name="${1##*/}"
[ -z "$name" ] && usage [ -z "$name" ] && usage
[ -f "$ENVDIR/.git/refs/heads/$name" ] || error "environment '$name' not found"
env_init env_init
env_ask_sync env_ask_sync
git checkout "$name" git checkout "$name" || error "environment '$name' not found"
env_link_config env_link_config
} }