From f48a5b11d709ec616f766864b8e0ab894cb30962 Mon Sep 17 00:00:00 2001
From: Yamashita Yuu <peek824545201@gmail.com>
Date: Sat, 7 Mar 2015 01:01:32 +0900
Subject: [PATCH] Import recent changes from rbenv
 4d72eefffc548081f6eee2e54d3b9116b9f9ee8e

---
 .travis.yml                | 3 ++-
 libexec/pyenv-version-name | 3 ---
 test/version-name.bats     | 6 +-----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b422439..848a5d11 100644
--- a/.travis.yml
+++ b/.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:
diff --git a/libexec/pyenv-version-name b/libexec/pyenv-version-name
index c15178e2..42c04c62 100755
--- a/libexec/pyenv-version-name
+++ b/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
diff --git a/test/version-name.bats b/test/version-name.bats
index 2d7ebe20..951d3e72 100644
--- a/test/version-name.bats
+++ b/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"
 }