Merge remote-tracking branch 'upstream/master' into tmp-unicode-path

* upstream/master: (83 commits)
  Remove trailing slash on drive path
  Further update for machines without ssh installed or on the path
  Update remote.py to fix issue #694
  IndexFile.commit() now runs pre-commit and post-commit and commit-msg hooks.
  Update base.py
  Update remote.py
  Update base.py
  Update remote.py
  Update signing key to latest version
  recognize the new packed-ref header format
  Only gc.collect() under windows
  Converting path in clone and clone_from to str before any other operation in case eg pathlib.Path is passed
  Fix encoding issue with stderr_value and kill_after_timeout
  Store submodule name
  updating AUTHORS
  Keeping env values passed to `clone_from`
  Fix test_docs
  Apparently bdist_wheel is only in python3
  version bump
  BF: Added missing NullHandler to logger in git.remote
  ...

Author: yarikoptic

.codeclimate.yml

@@ -0,0 +1,15 @@
+---
+engines:
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - python
+  pep8:
+    enabled: true
+  radon:
+    enabled: true
+ratings:
+  paths:
+  - "**.py"
+exclude_paths: 

.travis.yml

@@ -5,10 +5,17 @@ python:
   - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
+  - "3.6-dev"
+  - "3.7-dev"
+  - "nightly"
   # - "pypy" - won't work as smmap doesn't work (see gitdb/.travis.yml for details)
-#matrix:
-#  allow_failures:
-#    - python: "2.6"
+matrix:
+  allow_failures:
+    - python: "2.6"
+    - python: "3.6-dev"
+    - python: "3.7-dev"
+    - python: "nightly"
 git:
   # a higher depth is needed for most of the tests - must be high enough to not actually be shallow
   # as we clone our own repository in the process

AUTHORS

@@ -16,5 +16,14 @@ Contributors are:
 -Vincent Driessen <me _at_ nvie.com>
 -Phil Elson <pelson _dot_ pub _at_ gmail.com>
 -Bernard `Guyzmo` Pratz <[email protected]>
+-Timothy B. Hartman <tbhartman _at_ gmail.com>
+-Konstantin Popov <konstantin.popov.89 _at_ yandex.ru>
+-Peter Jones <pjones _at_ redhat.com>
+-Anson Mansfield <anson.mansfield _at_ gmail.com>
+-Ken Odegard <ken.odegard _at_ gmail.com>
+-Alexis Horgix Chotard
+-Piotr Babij <piotr.babij _at_ gmail.com>
+-Mikuláš Poul <mikulaspoul _at_ gmail.com>
+-Charles Bouchard-Légaré <cblegare.atl _at_ ntis.ca>
 
 Portions derived from other open source works and are clearly marked.

Makefile

@@ -14,5 +14,5 @@ release: clean
 
 force_release: clean
 	git push --tags
-	python setup.py sdist bdist_wheel
-	twine upload dist/*
+	python3 setup.py sdist bdist_wheel
+	twine upload -s -i [email protected] dist/*

README.md

@@ -32,7 +32,7 @@ If you have downloaded the source code:
 
 or if you want to obtain a copy from the Pypi repository:
 
-    pip install gitpython
+    pip install GitPython
 
 Both commands will install the required package dependencies.
 
@@ -123,6 +123,59 @@ Please have a look at the [contributions file][contributing].
   incrementing the patch level, and possibly by appending `-dev`. Probably you
   want to `git push` once more.
 
+### How to verify a release
+
+Please only use releases from `pypi` as you can verify the respective source 
+tarballs.
+
+This script shows how to verify the tarball was indeed created by the authors of
+this project:
+
+```
+curl https://pypi.python.org/packages/7e/13/2a556eb97dcf498c915e5e04bb82bf74e07bb8b7337ca2be49bfd9fb6313/GitPython-2.1.5-py2.py3-none-any.whl\#md5\=d3ecb26cb22753f4414f75f721f6f626z  > gitpython.whl
+curl https://pypi.python.org/packages/7e/13/2a556eb97dcf498c915e5e04bb82bf74e07bb8b7337ca2be49bfd9fb6313/GitPython-2.1.5-py2.py3-none-any.whl.asc > gitpython-signature.asc
+gpg --verify gitpython-signature.asc gitpython.whl
+```
+
+which outputs
+
+```
+gpg: Signature made Sat Jun 10 20:22:49 2017 CEST using RSA key ID 3B07188F
+gpg: Good signature from "Sebastian Thiel (In Rust I trust!) <[email protected]>" [unknown]
+gpg: WARNING: This key is not certified with a trusted signature!
+gpg:          There is no indication that the signature belongs to the owner.
+Primary key fingerprint: 4477 ADC5 977D 7C60 D2A7  E378 9FEE 1C6A 3B07 188F
+```
+
+You can verify that the keyid indeed matches the release-signature key provided in this
+repository by looking at the keys details:
+
+```
+gpg --list-packets ./release-verification-key.asc
+```
+
+You can verify that the commit adding it was also signed by it using:
+
+```
+git show --show-signature  ./release-verification-key.asc
+```
+
+If you would like to trust it permanently, you can import and sign it:
+
+```
+gpg --import ./release-verification-key.asc
+gpg --edit-key 9FEE1C6A3B07188F
+> sign
+> save
+```
+
+Afterwards verifying the tarball will yield the following:
+```
+$ gpg --verify gitpython-signature.asc gitpython.whl
+gpg: Signature made Sat Jun 10 20:22:49 2017 CEST using RSA key ID 3B07188F
+gpg: Good signature from "Sebastian Thiel (In Rust I trust!) <[email protected]>" [ultimate]
+```
+
 ### LICENSE
 
 New BSD License.  See the LICENSE file.

VERSION

@@ -1 +1 @@
-2.1.0
+2.1.6

doc/source/changes.rst

@@ -2,6 +2,25 @@
 Changelog
 =========
 
+2.1.6 - Bugfixes
+====================================
+
+* support for worktrees
+
+2.1.3 - Bugfixes
+====================================
+
+All issues and PRs can be viewed in all detail when following this URL:
+https://github.com/gitpython-developers/GitPython/milestone/21?closed=1
+
+
+2.1.1 - Bugfixes
+====================================
+
+All issues and PRs can be viewed in all detail when following this URL:
+https://github.com/gitpython-developers/GitPython/issues?q=is%3Aclosed+milestone%3A%22v2.1.1+-+Bugfixes%22
+
+
 2.1.0 - Much better windows support!
 ====================================
 
@@ -128,7 +147,7 @@ Please note that due to breaking changes, we have to increase the major version.
 1.0.2 - Fixes
 =============
 
-* IMPORTANT: Changed default object database of `Repo` objects to `GitComdObjectDB`. The pure-python implementation
+* IMPORTANT: Changed default object database of `Repo` objects to `GitCmdObjectDB`. The pure-python implementation
   used previously usually fails to release its resources (i.e. file handles), which can lead to problems when working
   with large repositories.
 * CRITICAL: fixed incorrect `Commit` object serialization when authored or commit date had timezones which were not

git/__init__.py

@@ -35,24 +35,49 @@ def _init_externals():
 
 #{ Imports
 
-from git.config import GitConfigParser  # @NoMove @IgnorePep8
-from git.objects import *               # @NoMove @IgnorePep8
-from git.refs import *                  # @NoMove @IgnorePep8
-from git.diff import *                  # @NoMove @IgnorePep8
-from git.exc import *                   # @NoMove @IgnorePep8
-from git.db import *                    # @NoMove @IgnorePep8
-from git.cmd import Git                 # @NoMove @IgnorePep8
-from git.repo import Repo               # @NoMove @IgnorePep8
-from git.remote import *                # @NoMove @IgnorePep8
-from git.index import *                 # @NoMove @IgnorePep8
-from git.util import (                  # @NoMove @IgnorePep8
-    LockFile,
-    BlockingLockFile,
-    Stats,
-    Actor
-)
+from git.exc import *                       # @NoMove @IgnorePep8
+try:
+    from git.config import GitConfigParser  # @NoMove @IgnorePep8
+    from git.objects import *               # @NoMove @IgnorePep8
+    from git.refs import *                  # @NoMove @IgnorePep8
+    from git.diff import *                  # @NoMove @IgnorePep8
+    from git.db import *                    # @NoMove @IgnorePep8
+    from git.cmd import Git                 # @NoMove @IgnorePep8
+    from git.repo import Repo               # @NoMove @IgnorePep8
+    from git.remote import *                # @NoMove @IgnorePep8
+    from git.index import *                 # @NoMove @IgnorePep8
+    from git.util import (                  # @NoMove @IgnorePep8
+        LockFile,
+        BlockingLockFile,
+        Stats,
+        Actor,
+        rmtree,
+    )
+except GitError as exc:
+    raise ImportError('%s: %s' % (exc.__class__.__name__, exc))
 
 #} END imports
 
 __all__ = [name for name, obj in locals().items()
            if not (name.startswith('_') or inspect.ismodule(obj))]
+
+
+#{ Initialize git executable path
+GIT_OK = None
+
+def refresh(path=None):
+    """Convenience method for setting the git executable path."""
+    global GIT_OK
+    GIT_OK = False
+
+    if not Git.refresh(path=path):
+        return
+    if not FetchInfo.refresh():
+        return
+
+    GIT_OK = True
+#} END initialize git executable path
+
+#################
+refresh()
+#################