summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2009-01-06 19:20:37 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2009-01-06 19:20:37 +0100
commit8f3c9be9bae336fe90c08ab783fee92645e1003c (patch)
treebfef3e6742a505b68c0785ceeef6710c32f4164f /bin
parent13a7dcb4ff695b898cf79045c862b96064e7761d (diff)
pkg: vcs_upgrade: Fixed parameter name
Diffstat (limited to 'bin')
-rwxr-xr-xbin/pkg4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/pkg b/bin/pkg
index 0b0a0c2..519bfe1 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -232,9 +232,9 @@ function vcs_upgrade {
typeset IFS=$'\n' line
typeset -i merge_ok=0
for line in $(git branch); {
- [[ $line == '* master' ]] && ok=1
+ [[ $line == '* master' ]] && merge_ok=1
}
- if ((ok)) {
+ if ((merge_ok)) {
git pull $PKG_ROOT/${PWD:t} master
} else {
git fetch $PKG_rOOT/${PWD:t} master