From b07eafd3d2c7c50d3079a440ded6cce1128a05e7 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Wed, 12 Jun 2013 09:33:17 +0100 Subject: 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. --- scripts/mageia-reset-and-import.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts') 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 " --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 -- cgit v1.2.1