Set admin e-mail address properly on MediaWiki >= 1.18.0

[wizard.git] / bin / prepare-retro-upgrade

diff --git a/bin/prepare-retro-upgrade b/bin/prepare-retro-upgrade
index eaa9e621b09408341dc3b07c325c21c855d22f0c..10a8ae7b28668990d34f32dfad18099ae47dbe61 100755 (executable)
--- a/bin/prepare-retro-upgrade
+++ b/bin/prepare-retro-upgrade
@@ -28,7 +28,7 @@ git reset --hard $APP-$PRIOR-scripts
 git checkout -b tpristine || git checkout tpristine
 git reset --hard $APP-$PRIOR
 
-DATE=`git show HEAD --format="format:%cd" | head -n1`
+DATE=`git show tmaster --pretty="format:%cd" | head -n1`
 
 export GIT_AUTHOR_DATE="$DATE"
 export GIT_COMMITTER_DATE="$DATE"
@@ -38,6 +38,6 @@ git commit -asm "$APPLICATION $VERSION"
 git tag $APP-$VERSION
 
 git checkout tmaster
-git merge tpristine --no-commit || bash || true
+git merge tpristine --no-commit || (echo "Dropping into shell; exit when complete." && bash) || true
 git commit -asm "$APPLICATION $VERSION-scripts"
 git tag $APP-$VERSION-scripts