diff mbox

[4/4] compat-wireless: find the actual remote URL

Message ID 20100407053108.23575.92800.stgit@mj.roinet.com (mailing list archive)
State Not Applicable, archived
Headers show

Commit Message

Pavel Roskin April 7, 2010, 5:31 a.m. UTC
None
diff mbox

Patch

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index af4479a..5d8068d 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -295,15 +295,20 @@  done
 DIR="$PWD"
 cd $GIT_TREE
 GIT_DESCRIBE=$(git describe)
+GIT_BRANCH=$(git branch --no-color |sed -n 's/^\* //p')
+GIT_BRANCH=${GIT_BRANCH-master}
+GIT_REMOTE=$(git config branch.${GIT_BRANCH}.remote)
+GIT_REMOTE=${GIT_REMOTE-origin}
+GIT_REMOTE_URL=$(git config remote.${GIT_REMOTE}.url)
+GIT_REMOTE_URL=${GIT_REMOTE_URL-unknown}
 echo -e "${GREEN}Updated${NORMAL} from local tree: ${BLUE}${GIT_TREE}${NORMAL}"
-echo -e "Origin remote URL: ${CYAN}$(git config remote.origin.url)${NORMAL}"
+echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}"
 cd $DIR
 if [ -d ./.git ]; then
 	git describe > compat-release
 
 	cd $GIT_TREE
-	TREE_NAME=$(git config remote.origin.url)
-	TREE_NAME=${TREE_NAME##*/}
+	TREE_NAME=${GIT_REMOTE_URL##*/}
 
 	echo $TREE_NAME > $DIR/git-describe
 	echo $GIT_DESCRIBE >> $DIR/git-describe