A new version in pom.xml needs to be committed.
diff --git a/release_prepare.sh b/release_prepare.sh
index 4e726db..7ec2d36 100755
--- a/release_prepare.sh
+++ b/release_prepare.sh
@@ -81,6 +81,14 @@
fi
}
+function git_commit_if
+{
+ if ! git diff-index --quiet HEAD
+ then
+ git commit -m "${1}"
+ fi
+}
+
function set_release_date_if
{
local today=$(date "+%Y-%m-%d")
@@ -161,6 +169,8 @@
local pom_new_ver="${new_dev_ver:-${pom_orig_ver}}"
sed -i -r "s/^(\t<version>).+(<)/\1${pom_new_ver}\2/" "pom.xml"
+ git add "pom.xml"
+ git_commit_if "Revert to ${pom_new_ver}."
}
function exec_mvn
@@ -225,12 +235,8 @@
git add "pom.xml"
git add "src/changes/changes.xml"
- if ! git diff-index --quiet HEAD
- then
- git commit -m "Prepare for next development iteration: ${new_dev_ver_short}"
- fi
-
- git checkout "next_stable"
+ git_commit_if "Prepare for next development iteration: ${new_dev_ver_short}"
+ git checkout "next_stable"
}
main