projects
/
openwrt
/
staging
/
yousong.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
081d16f
)
fix ./scripts/env for newer git versions
author
Felix Fietkau
<nbd@openwrt.org>
Tue, 2 Sep 2008 15:48:40 +0000
(15:48 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Tue, 2 Sep 2008 15:48:40 +0000
(15:48 +0000)
SVN-Revision: 12502
scripts/env
patch
|
blob
|
history
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
}