Merge rbenv to have a common ancestor for future merges

[blueyed]

This merges
https://github.com/sstephenson/rbenv/commits/4d72eefffc548081f6eee2e54d3b9116b9f9ee8e
to build a common ancestor for future merges.

This is branched off f48a5b1, which was
the last manual merge.

Discussion / initial idea: #286 (comment)

This was done using:

# Keep our changes for "unmerged, both added"
for i in $(git status --porcelain | grep '^AA ' | cut -d\  -f2); do
  git checkout --ours $i
  git add $i
done

# "git mv" rbenv files to our name, keeping the current contents.
for i in $(git status --porcelain | grep '^A ' | sed 's/^A  //'); do
  ours=${i//rbenv/pyenv}
  test -f $ours || { echo "Skipping: $i"; continue; }
  git mv -f $i $ours
  git reset HEAD $ours
done

I've handled the following then manually:

- rbenv.d/exec/gem-rehash.bash
- rbenv.d/exec/gem-rehash/rubygems_plugin.rb

This should allow to merge rbenv in the future using:

git merge rbenv/master -s recursive -X rename-threshold=5%

I am not sure about the rename-threshold, 25% also worked for one file
I've tested.

Conflicts:
.gitignore
.travis.yml
LICENSE
README.md
src/Makefile.in
test/--version.bats
test/commands.bats
test/completions.bats
test/exec.bats
test/global.bats
test/help.bats
test/hooks.bats
test/init.bats
test/local.bats
test/prefix.bats
test/rehash.bats
test/run
test/shell.bats
test/shims.bats
test/test_helper.bash
test/version-file-read.bats
test/version-file-write.bats
test/version-file.bats
test/version-name.bats
test/version-origin.bats
test/version.bats
test/versions.bats
test/whence.bats
test/which.bats

[yyuu]

😵

Anyway I'll try to check this out. Gimme some more time....

[blueyed]

Sure.

The changes are easy to review (there are none).. ;)

You could experiment with this trying to merge the latest changes from rbenv etc.

git fetch origin
git checkout -b merge-rbenv origin/merge-rbenv
git remote add rbenv git://github.com/sstephenson/rbenv.git
git merge --no-commit rbenv/master

This will currently result in a conflict for README.md, mainly because there is a new section about environment variables, which should be adopted.

As suggested in #286 (comment) that would be a good time to install/enable git-rerere now, too.. :)