diff options
Diffstat (limited to 'scripts/mageia-reset-and-import.sh')
| -rwxr-xr-x | scripts/mageia-reset-and-import.sh | 8 |
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") |