From 8ece5fb90b132428d9c3383f73a5452eb7cba2aa Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Thu, 12 Mar 2009 23:53:07 +0100 Subject: pkg: Really fixed vcs_fix_origin, at least for now --- bin/pkg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/pkg b/bin/pkg index 35f2b19..ddfdb95 100755 --- a/bin/pkg +++ b/bin/pkg @@ -257,6 +257,8 @@ function vcs_fix_origin { if [[ ! -r .git/remotes/origin && ! -r .git/refs/remotes/origin/HEAD ]] { fgrep '[remote "origin"]' .git/config &> /dev/null || git remote add origin $PKG_ROOT/${PWD:t} + git config branch.master.remote origin + git config branch.master.merge refs/heads/master } git remote update &> /dev/null } -- cgit v1.2.3