From b20f9ae84879abd7a23650b0d517737ac5594d0f Mon Sep 17 00:00:00 2001 From: Bruce Potter Date: Tue, 27 Aug 2013 11:23:22 -0400 Subject: [PATCH 1/2] change git cmd used to get current branch --- buildcore.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildcore.sh b/buildcore.sh index 7ec8b0a7a..a0cd222e5 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -88,7 +88,8 @@ fi # for the git case, query the current branch and set REL (changing master to devel if necessary) function setbranch { #git checkout $BRANCH - REL=`git rev-parse --abbrev-ref HEAD` + #REL=`git rev-parse --abbrev-ref HEAD` + REL='git name-rev --name-only HEAD' if [ "$REL" = "master" ]; then REL="devel" fi From f61d224d1c270f59e044bdc4e86a2e348840f5da Mon Sep 17 00:00:00 2001 From: Bruce Potter Date: Tue, 27 Aug 2013 12:49:04 -0400 Subject: [PATCH 2/2] fix bld script change --- buildcore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildcore.sh b/buildcore.sh index a0cd222e5..e337d4e60 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -89,7 +89,7 @@ fi function setbranch { #git checkout $BRANCH #REL=`git rev-parse --abbrev-ref HEAD` - REL='git name-rev --name-only HEAD' + REL=`git name-rev --name-only HEAD` if [ "$REL" = "master" ]; then REL="devel" fi