summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2011-11-03 09:09:46 +0100
committerPierre Schmitz <pierre@archlinux.de>2011-11-04 19:38:11 +0100
commitb7a3c74c5036a9f829aab478fc8c5be146b79ce3 (patch)
tree6a7aa831f2e38eb75629b595968805ee99ff626f
parenta33ee6e78d6ee94eda098addd07113bd4581fc38 (diff)
downloaddevtools32-b7a3c74c5036a9f829aab478fc8c5be146b79ce3.tar.xz
commitpkg: Fix commit message
Move the message template before the if block. We moved this to the else branch in commit aaa68e49e8e5a68950a63b9aa4a8c1f6aed2e2d2 which lead to "msgtemplate" being unset if one specifies a commit message on the command line, thus stripping the "upgpkg:" part. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
-rw-r--r--commitpkg.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/commitpkg.in b/commitpkg.in
index ba98aaa..bc18d83 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -90,12 +90,12 @@ done
shift $(( OPTIND - 1 ))
if [ -n "$(svn status -q)" ]; then
+ msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n'
if [ -n "$1" ]; then
stat_busy 'Committing changes to trunk'
svn commit -q -m "${msgtemplate}${1}" || die
stat_done
else
- msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n'
msgfile="$(mktemp)"
echo "$msgtemplate" > "$msgfile"
if [ -n "$SVN_EDITOR" ]; then