[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gcompris] tools: tools, fix cleanup of created branch
From:       Bruno Coudoin <bruno.coudoin () gcompris ! net>
Date:       2016-08-07 13:57:07
Message-ID: E1bWOZf-0004Ei-71 () code ! kde ! org
[Download RAW message or body]

Git commit 805bc1371f0839a8e8010a0fe96303ffa122f4bb by Bruno Coudoin.
Committed on 07/08/2016 at 13:56.
Pushed by bcoudoin into branch 'master'.

tools, fix cleanup of created branch

M  +2    -1    tools/source_build_dist.sh

http://commits.kde.org/gcompris/805bc1371f0839a8e8010a0fe96303ffa122f4bb

diff --git a/tools/source_build_dist.sh b/tools/source_build_dist.sh
index ce836b9..df3df87 100755
--- a/tools/source_build_dist.sh
+++ b/tools/source_build_dist.sh
@@ -12,6 +12,7 @@ fi
 
 # The current version
 version=$(sed -n -e 's/set(GCOMPRIS_MINOR_VERSION \([0-9]\+\)).*/\1/p' CMakeLists.txt)
+curbranch=$(git rev-parse --abbrev-ref HEAD)
 
 # Uncomment if this is not already done
 git checkout -b 0.${version}-po
@@ -22,5 +23,5 @@ make getSvnTranslations
 git add -f ../po
 git commit -a -m "PO INTEGRATED / DO NOT PUSH ME"
 make dist
-git checkout 0.${version}
+git checkout ${curbranch}
 git branch -D 0.${version}-po
[prev in list] [next in list] [prev in thread] [next in thread]