diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-06-12 22:27:23 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-06-12 22:27:23 +0100 |
| commit | a56684ae89c65f42f9f8c5f8b1b90f32e9a61ffd (patch) | |
| tree | 3fa8a0b26a5ab663bbd0483017e0aae8a6732651 | |
| parent | 3bfed364433cbbfec668bb192d1b95188c530c8d (diff) | |
| download | svn-git-migration-a56684ae89c65f42f9f8c5f8b1b90f32e9a61ffd.tar svn-git-migration-a56684ae89c65f42f9f8c5f8b1b90f32e9a61ffd.tar.gz svn-git-migration-a56684ae89c65f42f9f8c5f8b1b90f32e9a61ffd.tar.bz2 svn-git-migration-a56684ae89c65f42f9f8c5f8b1b90f32e9a61ffd.tar.xz svn-git-migration-a56684ae89c65f42f9f8c5f8b1b90f32e9a61ffd.zip | |
Rename variable to be less generic.
| -rwxr-xr-x | scripts/mageia-reset-and-import.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh index 5461e52..ce03394 100755 --- a/scripts/mageia-reset-and-import.sh +++ b/scripts/mageia-reset-and-import.sh @@ -268,14 +268,14 @@ echo "Press any key to continue with the subversion import process". read -n 1 git svn gc -sha1=$(git rev-list --max-count=1 HEAD) +fakesha1=$(git rev-list --max-count=1 HEAD) echo -echo -n "Updating trunk branch to include synthesized commit $sha1... " -git update-ref -m "Reset to synthesized commit representing Magiea cleaned import (SVN Git)" refs/remotes/trunk $sha1 +echo -n "Updating trunk branch to include synthesized commit $fakesha1... " +git update-ref -m "Reset to synthesized commit representing Magiea cleaned import (SVN Git)" refs/remotes/trunk $fakesha1 echo "done" echo -n "Faking git-svn metadata to allow continuation... " -printf "0000000: %08x%s\t................" $revision $sha1 | xxd -r -c24 >.git/svn/refs/remotes/trunk/.rev_map.$NEWSVNUUID +printf "0000000: %08x%s\t................" $revision $fakesha1 | xxd -r -c24 >.git/svn/refs/remotes/trunk/.rev_map.$NEWSVNUUID echo "done" # Keep a small log of the sha1's etc. @@ -283,9 +283,9 @@ if [ -z "$REPLAY" ]; then if [ ! -f ../svn-import.log ]; then echo "software,startingcommit,startingrevision,otherrevisions,skiprevisions,fakecommit" >../svn-import.log fi - echo "$SOFTWARE,$resetsha1,$revision,$morerevisions,$skiprevisions,$sha1" >>../svn-import.log + echo "$SOFTWARE,$resetsha1,$revision,$morerevisions,$skiprevisions,$fakesha1" >>../svn-import.log else - sed -i "s/,$synthesized\$/,$sha1/" ../svn-import.log + sed -i "s/,$synthesized\$/,$fakesha1/" ../svn-import.log fi echo "Continuing svn fetch" |