release-version.sh: continue in case of no changes

ctrueden · ctrueden · commit d256263fa7dd · 2013-06-04T15:41:15.000-05:00
Particularly when running outside batch mode, we might reset to the same
SNAPHOT version afterwards, so there may actually be no changes to
master at all. In that case, don't try to commit, because otherwise the
'git commit' command will return a non-zero error code, terminating the
script early.
diff --git a/release-version.sh b/release-version.sh
@@ -64,7 +64,10 @@ mvn $BATCH_MODE release:prepare -DpushChanges=false -Dresume=false \
 
 # Squash the two commits on the current branch into one
 git reset --soft HEAD^^ &&
-git commit -s -m "Bump to next development cycle" &&
+if ! git diff-index --cached --quiet --ignore-submodules HEAD --
+then
+	git commit -s -m "Bump to next development cycle"
+fi &&
 
 # push the current branch and the tag
 tag=$(sed -n 's/^scm.tag=//p' < release.properties) &&
