summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2009-03-08 19:06:27 +0100
committerDaniel Friesel <derf@derf.homelinux.org>2009-03-08 19:06:27 +0100
commit371264cb8917934897baa35a41f8caef21560929 (patch)
tree0e1fb0c9264d96a54d05b79de67f9caa01590dff
parenta974aa305a8203d943d1395776c246f5b198a390 (diff)
pkg: vcs_upgrade: assume branches are set up correctly and do git pull without arguments
-rwxr-xr-xbin/pkg12
1 files changed, 1 insertions, 11 deletions
diff --git a/bin/pkg b/bin/pkg
index cb3e144..1266f21 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -237,17 +237,7 @@ function vcs_log {
}
function vcs_upgrade {
- typeset IFS=$'\n' line
- typeset branch
- for line in $(git branch); {
- [[ $line == \*\ * ]] && branch=${line#* }
- }
- debug "branch = $branch"
- if [[ -z $branch ]] {
- warn "vcs_upgrade: $PWD: cannot determine current branch, not pulling"
- return 1
- }
- git pull $PKG_ROOT/${PWD:t} $branch
+ git pull
vcs_fix_origin
}