summaryrefslogtreecommitdiff
path: root/bin/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'bin/pkg')
-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