Import recent changes from rbenv 4d72eefffc

.travis.yml

@@ -1,4 +1,5 @@
-install: git clone https://github.com/sstephenson/bats.git
+sudo: false
+install: git clone --depth 1 https://github.com/sstephenson/bats.git
 script: make test
 language: c
 env:

libexec/pyenv-version-name

@@ -25,9 +25,6 @@ OLDIFS="$IFS"
     if version_exists "$version" || [ "$version" = "system" ]; then
       versions=("${versions[@]}" "${version}")
     elif version_exists "${version#python-}"; then
-      { echo "warning: ignoring extraneous \`python-' prefix in version \`${version}'"
-        echo "         (set by $(pyenv-version-origin))"
-      } >&2
       versions=("${versions[@]}" "${version#python-}")
     else
       echo "pyenv: version \`$version' is not installed" >&2

test/version-name.bats

@@ -57,9 +57,5 @@ setup() {
   cat > ".python-version" <<<"python-2.7.6"
   run pyenv-version-name
   assert_success
-  assert_output <<OUT
-warning: ignoring extraneous \`python-' prefix in version \`python-2.7.6'
-         (set by ${PWD}/.python-version)
-2.7.6
-OUT
+  assert_output "2.7.6"
 }