diff options
author | Daniel Friesel <derf@derf.homelinux.org> | 2009-03-12 23:53:07 +0100 |
---|---|---|
committer | Daniel Friesel <derf@derf.homelinux.org> | 2009-03-12 23:53:07 +0100 |
commit | 8ece5fb90b132428d9c3383f73a5452eb7cba2aa (patch) | |
tree | f265f932361f4bdfd416e51bfc83ef2cf9861cd5 /bin/pkg | |
parent | 095b03de267711780422363a7ceaeb32a0aa7aa3 (diff) |
pkg: Really fixed vcs_fix_origin, at least for now
Diffstat (limited to 'bin/pkg')
-rwxr-xr-x | bin/pkg | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 } |