From kde-commits Sun Aug 07 13:55:25 2016 From: Bruno Coudoin Date: Sun, 07 Aug 2016 13:55:25 +0000 To: kde-commits Subject: [gcompris/KDE/0.60] tools: tools, fix cleanup of created branch Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=147057813530886 Git commit 67e672179b4270d829447cb51fbcd019d4e03094 by Bruno Coudoin. Committed on 07/08/2016 at 13:55. Pushed by bcoudoin into branch 'KDE/0.60'. tools, fix cleanup of created branch M +2 -1 tools/source_build_dist.sh http://commits.kde.org/gcompris/67e672179b4270d829447cb51fbcd019d4e03094 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=3D$(sed -n -e 's/set(GCOMPRIS_MINOR_VERSION \([0-9]\+\)).*/\1/p' C= MakeLists.txt) +curbranch=3D$(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