Commit b7a3c74c authored Nov 03, 2011 by Lukas Fleischer Committed by Pierre Schmitz Nov 04, 2011

commitpkg: Fix commit message



Move the message template before the if block. We moved this to the else
branch in commit aaa68e49 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>

parent a33ee6e7

commitpkg.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -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