summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-06-12 21:24:58 +0100
committerColin Guthrie <colin@mageia.org>2013-06-12 21:25:02 +0100
commit3bfed364433cbbfec668bb192d1b95188c530c8d (patch)
tree0475bb515a5e443785b0a2504b362e17136730c8 /scripts
parent227fba8d9d8129a1cb3e74c1810fd6f638b4240c (diff)
downloadsvn-git-migration-3bfed364433cbbfec668bb192d1b95188c530c8d.tar
svn-git-migration-3bfed364433cbbfec668bb192d1b95188c530c8d.tar.gz
svn-git-migration-3bfed364433cbbfec668bb192d1b95188c530c8d.tar.bz2
svn-git-migration-3bfed364433cbbfec668bb192d1b95188c530c8d.tar.xz
svn-git-migration-3bfed364433cbbfec668bb192d1b95188c530c8d.zip
Rename a variable to be clearer as to what it represents
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mageia-reset-and-import.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/mageia-reset-and-import.sh b/scripts/mageia-reset-and-import.sh
index 5bbef3b..5461e52 100755
--- a/scripts/mageia-reset-and-import.sh
+++ b/scripts/mageia-reset-and-import.sh
@@ -110,9 +110,9 @@ else
# traverse back up the tag tree to find the first commit that *do not*
# result in any changes (i.e. not an svn cp) and use that as our reference
# comparison point.
- refsha1=$(git rev-parse "$ref":)
+ reftreesha1=$(git rev-parse "$ref":)
parentref=$ref
- while [ $(git rev-parse --quiet --verify "$parentref"^: ) = "$refsha1" ]; do
+ while [ $(git rev-parse --quiet --verify "$parentref"^: ) = "$reftreesha1" ]; do
parentref="$parentref"^
done
@@ -326,11 +326,11 @@ git branch -D origin/master 2>/dev/null
git for-each-ref --format='%(refname)' refs/heads/tags | cut -d / -f 4 | \
while read tag; do
ref="refs/heads/tags/$tag"
- refsha1=$(git rev-parse "$ref":)
+ reftreesha1=$(git rev-parse "$ref":)
# Find the oldest ancestor for which the tree is the same
parentref="$ref"
- while [ $(git rev-parse --quiet --verify "$parentref"^:) = "$refsha1" ]; do
+ while [ $(git rev-parse --quiet --verify "$parentref"^:) = "$reftreesha1" ]; do
parentref="$parentref"^
done
parent=$(git rev-parse "$parentref")