commitpkg: Fix commit message
Move the message template before the if block. We moved this to the else
branch in commit aaa68e49e8
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>
This commit is contained in:
parent
a33ee6e78d
commit
b7a3c74c50
|
@ -90,12 +90,12 @@ done
|
||||||
shift $(( OPTIND - 1 ))
|
shift $(( OPTIND - 1 ))
|
||||||
|
|
||||||
if [ -n "$(svn status -q)" ]; then
|
if [ -n "$(svn status -q)" ]; then
|
||||||
|
msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n'
|
||||||
if [ -n "$1" ]; then
|
if [ -n "$1" ]; then
|
||||||
stat_busy 'Committing changes to trunk'
|
stat_busy 'Committing changes to trunk'
|
||||||
svn commit -q -m "${msgtemplate}${1}" || die
|
svn commit -q -m "${msgtemplate}${1}" || die
|
||||||
stat_done
|
stat_done
|
||||||
else
|
else
|
||||||
msgtemplate="upgpkg: $pkgbase $(get_full_version)"$'\n\n'
|
|
||||||
msgfile="$(mktemp)"
|
msgfile="$(mktemp)"
|
||||||
echo "$msgtemplate" > "$msgfile"
|
echo "$msgtemplate" > "$msgfile"
|
||||||
if [ -n "$SVN_EDITOR" ]; then
|
if [ -n "$SVN_EDITOR" ]; then
|
||||||
|
|
Loading…
Reference in New Issue