From b7a3c74c5036a9f829aab478fc8c5be146b79ce3 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Thu, 3 Nov 2011 09:09:46 +0100
Subject: 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>
---
 commitpkg.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
-- 
cgit v1.2.3-24-g4f1b