Merge branch 'rbenv-pr531'

libexec/pyenv

@@ -18,6 +18,8 @@ if [ -z "$READLINK" ]; then
   exit 1
 fi
 
+unset GREP_OPTIONS
+
 resolve_link() {
   $READLINK "$1"
 }

test/libexec/pyenv-grep

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+grep -E "$@"

test/pyenv.bats

@@ -45,3 +45,11 @@ load test_helper
   assert_failure
   assert_output "pyenv: cannot change working directory to \`$dir'"
 }
+
+@test "conflicting GREP_OPTIONS" {
+  file="${BATS_TMPDIR}/hello"
+  echo "hello" > "$file"
+  GREP_OPTIONS="-F" run pyenv grep "hell." "$file"
+  assert_success
+  assert_output "hello"
+}