From 371264cb8917934897baa35a41f8caef21560929 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@derf.homelinux.org>
Date: Sun, 8 Mar 2009 19:06:27 +0100
Subject: pkg: vcs_upgrade: assume branches are set up correctly and do git
 pull without arguments

---
 bin/pkg | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'bin')

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
 }
 
-- 
cgit v1.2.3