pkg: vcs_upgrade: Only fail on non-master branch when not using origin

1 files changed, 6 insertions, 6 deletions

diff --git a/bin/pkg b/bin/pkg
index d96698e..c4fb45e 100755
--- a/bin/pkg
+++ b/bin/pkg
@@ -246,17 +246,17 @@ function vcs_upgrade {
 	for line in $(git branch); {
 		[[ $line == \*\ * ]] && branch=${line#* }
 	}
-	if [[ $branch != master ]] {
-		warn "$1: The currently checked out branch is not master, but '$branch'" \
-			"Currently, pkg can only operate on the branch master" \
-			" -> skipping repo, please fix manually or report a bug"
-		return 1
-	}
 	if ((GIT_USE_ORIGIN)) {
 		# the package might be newly created and not have an origin yet
 		vcs_fix_origin
 		git pull
 	} else {
+		if [[ $branch != master ]] {
+			warn "$1: The currently checked out branch is not master, but '$branch'" \
+				"Currently, pkg can only operate on the branch master" \
+				" -> skipping repo, please fix manually or report a bug"
+			return 1
+		}
 		git pull $PKG_ROOT/${PWD:t} master
 	}
 }