From 81495c1177626dfdf09cbf29d9811a8f5b81e262 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 4 Nov 2009 15:09:31 +1000 Subject: [PATCH] release.sh: use the remote consistently. Don't just use the specified remote for the git push, also check on the remote for the tag names, etc. Signed-off-by: Peter Hutterer Reviewed-by: Jeremy Huddleston Reviewed-by: Julien Cristau --- release.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release.sh b/release.sh index d76bc5f..aee00c3 100755 --- a/release.sh +++ b/release.sh @@ -138,7 +138,7 @@ fi # Check if the object has been pushed. Do do so # 1. Check if the current branch has the object. If not, abort. -# 2. Check if the object is on origin/branchname. If not, abort. +# 2. Check if the object is on $remote/branchname. If not, abort. local_sha=`git rev-list -1 $tag_current` current_branch=`git branch | grep "\*" | sed -e "s/\* //"` set +e @@ -149,12 +149,12 @@ if [ $? -eq 1 ]; then exit 1 fi -revs=`git rev-list origin/$current_branch..$current_branch | wc -l` +revs=`git rev-list $remote/$current_branch..$current_branch | wc -l` if [ $revs -ne 0 ]; then - git rev-list origin/$current_branch..$current_branch | grep $local_sha > /dev/null + git rev-list $remote/$current_branch..$current_branch | grep $local_sha > /dev/null if [ $? -ne 1 ]; then - echo "origin/$current_branch doesn't have object $local_sha" + echo "$remote/$current_branch doesn't have object $local_sha" echo "for tag '$tag_current'. Did you push branch first? Aborting." exit 1 fi -- 2.11.4.GIT