summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-06-12 09:33:17 +0100
committerColin Guthrie <colin@mageia.org>2013-06-12 09:33:17 +0100
commitb07eafd3d2c7c50d3079a440ded6cce1128a05e7 (patch)
tree4ff637214cd0f8f2b7f0d964bac3ea2c7b1bd04e
parentb2fac4bcb881f1ed96e634a265ff0ee3528925f7 (diff)
downloadsvn-git-migration-b07eafd3d2c7c50d3079a440ded6cce1128a05e7.tar
svn-git-migration-b07eafd3d2c7c50d3079a440ded6cce1128a05e7.tar.gz
svn-git-migration-b07eafd3d2c7c50d3079a440ded6cce1128a05e7.tar.bz2
svn-git-migration-b07eafd3d2c7c50d3079a440ded6cce1128a05e7.tar.xz
svn-git-migration-b07eafd3d2c7c50d3079a440ded6cce1128a05e7.zip
Make sure the commit date on our synthesised commit is also set.
Passing --author and --date to the commit command works fine for *author* commit dates but not the actual *committer* dates (and name). This ensures that the values are correct.
-rwxr-xr-xscripts/mageia-reset-and-import.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh
index da290ec..8a301c3 100755
--- a/scripts/mageia-reset-and-import.sh
+++ b/scripts/mageia-reset-and-import.sh
@@ -253,7 +253,13 @@ if [ -n "$morerevisions" ]; then
fi
COMMITDATE=$(svn log -r $revision $NEWSVNURL/$SOFTWARE | head -n2 | tail -n1 | cut -d'|' -f3 | cut -d'(' -f1 | trim)
-git commit --author="Mageia SVN-Git Migration <svn-git-migration@mageia.org>" --date="$COMMITDATE" --file=$COMMITTXT -a
+env GIT_COMMITTER_NAME="Mageia SVN-Git Migration" \
+ GIT_COMMITTER_EMAIL="svn-git-migration@mageia.org" \
+ GIT_COMMITTER_DATE="$COMMITDATE" \
+ GIT_AUTHOR_NAME="Mageia SVN-Git Migration" \
+ GIT_AUTHOR_EMAIL="svn-git-migration@mageia.org" \
+ GIT_AUTHOR_DATE="$COMMITDATE" \
+ git commit -a --file=$COMMITTXT
rm -f $COMMITTXT
echo