From 4e028ea35b923b9842a12eca1f273b714b8bf7ab Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Mon, 22 Oct 2012 08:55:27 +0400 Subject: [PATCH] pull origin current_branch --- sbin/gentoo-upgrade.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/gentoo-upgrade.sh b/sbin/gentoo-upgrade.sh index 69720df..5cfc24a 100755 --- a/sbin/gentoo-upgrade.sh +++ b/sbin/gentoo-upgrade.sh @@ -63,8 +63,8 @@ let STAGE_CNT++ if [ $STAGE_CNT -eq $STAGE ]; then if [ -d /etc/portage/.git ]; then echo "======= STAGE $STAGE: pull portage config changes =======" - cd /etc/portage && git pull - [ 0 -ne $? ] && echo "Stage $STAGE: cd /etc/portage && git pull failed ;-( =======" && exit $STAGE + cd /etc/portage && git pull origin `git rev-parse --abbrev-ref HEAD` + [ 0 -ne $? ] && echo "Stage $STAGE: cd /etc/portage && git pull origin `git rev-parse --abbrev-ref HEAD` failed ;-( =======" && exit $STAGE fi let STAGE++