diff --git a/NEWS b/NEWS
index e81db816..1b288438 100644
--- a/NEWS
+++ b/NEWS
@@ -1,1985 +1,1988 @@
 0.19.15	UNRELEASED
 
+ * Properly handle files that are just executable for the
+   current user. (Jelmer Vernooij, #734)
+
 0.19.14	2019-11-30
 
  * Strip superfluous <> around email. (monnerat)
 
  * Stop checking for ref validity client-side. Users can
    still call check_wants manually. (Jelmer Vernooij)
 
  * Switch over to Google-style docstrings.
    (Jelmer Vernooij)
 
  * Add a ``dulwich.porcelain.active_branch`` function.
    (Jelmer Vernooij)
 
  * Cleanup new directory if clone fails. (Jelmer Vernooij, #733)
 
  * Expand "~" in global exclude path. (Jelmer Vernooij)
 
 0.19.13	2019-08-19
 
  BUG FIXES
 
  * Avoid ``PermissionError``, since it is Python3-specific.
   (Jelmer Vernooij)
 
  * Fix regression that added a dependency on C git for the
    test suite. (Jelmer Vernooij, #720)
 
  * Fix compatibility with Python 3.8 - mostly deprecation warnings.
    (Jelmer Vernooij)
 
 0.19.12	2019-08-13
 
  BUG FIXES
 
  * Update directory detection for `get_unstaged_changes` for Python 3.
    (Boris Feld, #684)
 
  * Add a basic ``porcelain.clean``. (Lane Barlow, #398)
 
  * Fix output format of ``porcelain.diff`` to match that of
    C Git. (Boris Feld)
 
  * Return a 404 not found error when repository is not found.
 
  * Mark ``.git`` directories as hidden on Windows.
    (Martin Packman, #585)
 
  * Implement ``RefsContainer.__iter__``
    (Jelmer Vernooij, #717)
 
  * Don't trust modes if they can't be modified after a file has been created.
    (Jelmer Vernooij, #719)
 
 0.19.11	2019-02-07
 
  IMPROVEMENTS
 
  * Use fullname from gecos field, if available.
    (Jelmer Vernooij)
 
  * Support ``GIT_AUTHOR_NAME`` / ``GIT_AUTHOR_EMAIL``.
    (Jelmer Vernooij)
 
  * Add support for short ids in parse_commit. (Jelmer Vernooij)
 
  * Add support for ``prune`` and ``prune_tags`` arguments
    to ``porcelain.fetch``. (Jelmer Vernooij, #681)
 
  BUG FIXES
 
   * Fix handling of race conditions when new packs appear.
     (Jelmer Vernooij)
 
 0.19.10	2018-01-15
 
  IMPROVEMENTS
 
  * Add `dulwich.porcelain.write_tree`.
    (Jelmer Vernooij)
 
  * Support reading ``MERGE_HEADS`` in ``Repo.do_commit``.
    (Jelmer Vernooij)
 
  * Import from ``collections.abc`` rather than ``collections`` where
    applicable. Required for 3.8 compatibility.
    (Jelmer Vernooij)
 
  * Support plain strings as refspec arguments to
    ``dulwich.porcelain.push``. (Jelmer Vernooij)
 
  * Add support for creating signed tags.
    (Jelmer Vernooij, #542)
 
  BUG FIXES
 
  *  Handle invalid ref that pretends to be a sub-folder under a valid ref.
     (KS Chan)
 
 0.19.9	2018-11-17
 
  BUG FIXES
 
  * Avoid fetching ghosts in ``Repo.fetch``.
    (Jelmer Vernooij)
 
  * Preserve port and username in parsed HTTP URLs.
    (Jelmer Vernooij)
 
  * Add basic server side implementation of ``git-upload-archive``.
    (Jelmer Vernooij)
 
 0.19.8	2018-11-06
 
  * Fix encoding when reading README file in setup.py.
    (egor <egor@sourced.tech>, #668)
 
 0.19.7	2018-11-05
 
  CHANGES
 
   * Drop support for Python 3 < 3.4. This is because
     pkg_resources (which get used by setuptools and mock)
     no longer supports 3.3 and earlier. (Jelmer Vernooij)
 
  IMPROVEMENTS
 
   * Support ``depth`` argument to ``GitClient.fetch_pack`` and support
     fetching and updating shallow metadata. (Jelmer Vernooij, #240)
 
  BUG FIXES
 
   * Don't write to stdout and stderr when they are not available
     (such as is the case for pythonw). (Sylvia van Os, #652)
 
   * Fix compatibility with newer versions of git, which expect CONTENT_LENGTH
     to be set to 0 for empty body requests. (Jelmer Vernooij, #657)
 
   * Raise an exception client-side when a caller tries to request
     SHAs that are not directly referenced the servers' refs.
     (Jelmer Vernooij)
 
   * Raise more informative errors when unable to connect to repository
     over SSH or subprocess. (Jelmer Vernooij)
 
   * Handle commit identity fields with multiple ">" characters.
     (Nicolas Dandrimont)
 
  IMPROVEMENTS
 
   * ``dulwich.porcelain.get_object_by_path`` method for easily
     accessing a path in another tree. (Jelmer Vernooij)
 
   * Support the ``i18n.commitEncoding`` setting in config.
     (Jelmer Vernooij)
 
 0.19.6	2018-08-11
 
  BUG FIXES
 
   * Fix support for custom transport arguments in ``dulwich.porcelain.clone``.
     (Semyon Slepov)
 
   * Fix compatibility with Python 3.8 (Jelmer Vernooij, Daniel M. Capella)
 
   * Fix some corner cases in ``path_to_tree_path``. (Romain Keramitas)
 
   * Support paths as bytestrings in various places in ``dulwich.index``
     (Jelmer Vernooij)
 
   * Avoid setup.cfg for now, since it seems to break pypi metadata.
     (Jelmer Vernooij, #658)
 
 0.19.5	2018-07-08
 
  IMPROVEMENTS
 
   * Add ``porcelain.describe``. (Sylvia van Os)
 
  BUG FIXES
 
   * Fix regression in ``dulwich.porcelain.clone`` that prevented cloning
     of remote repositories. (Jelmer Vernooij, #639)
 
   * Don't leave around empty parent directories for removed refs.
     (Damien Tournoud, #640)
 
 0.19.4	2018-06-24
 
  IMPROVEMENTS
 
   * Add ``porcelain.ls_files``. (Jelmer Vernooij)
 
   * Add ``Index.items``. (Jelmer Vernooij)
 
  BUG FIXES
 
   * Avoid unicode characters (e.g. the digraph ij in my surname) in setup.cfg,
     since setuptools doesn't deal well with them. See
     https://github.com/pypa/setuptools/issues/1062. (Jelmer Vernooij, #637)
 
 0.19.3	2018-06-17
 
  IMPROVEMENTS
 
   * Add really basic `dulwich.porcelain.fsck` implementation.
     (Jelmer Vernooij)
 
   * When the `DULWICH_PDB` environment variable is set, make
     SIGQUIT open pdb in the 'dulwich' command.
 
   * Add `checkout` argument to `Repo.clone`.
     (Jelmer Vernooij, #503)
 
   * Add `Repo.get_shallow` method. (Jelmer Vernooij)
 
   * Add basic `dulwich.stash` module. (Jelmer Vernooij)
 
   * Support a `prefix` argument to `dulwich.archive.tar_stream`.
     (Jelmer Vernooij)
 
  BUG FIXES
 
   * Fix handling of encoding for tags. (Jelmer Vernooij, #608)
 
   * Fix tutorial tests on Python 3. (Jelmer Vernooij, #573)
 
   * Fix remote refs created by `porcelain.fetch`. (Daniel Andersson, #623)
 
   * More robust pack creation on Windows. (Daniel Andersson)
 
   * Fix recursive option for `porcelain.ls_tree`. (Romain Keramitas)
 
  TESTS
 
   * Some improvements to paramiko tests. (Filipp Frizzy)
 
 0.19.2	2018-04-07
 
  BUG FIXES
 
   * Fix deprecated Index.iterblobs method.
     (Jelmer Vernooij)
 
 0.19.1	2018-04-05
 
  IMPROVEMENTS
 
   * Add 'dulwich.mailmap' file for reading mailmap files.
     (Jelmer Vernooij)
 
   * Dulwich no longer depends on urllib3[secure]. Instead,
     "dulwich[https]" can be used to pull in the necessary
     dependencies for HTTPS support. (Jelmer Vernooij, #616)
 
   * Support the `http.sslVerify` and `http.sslCAInfo`
     configuration options. (Jelmer Vernooij)
 
   * Factor out `dulwich.client.parse_rsync_url` function.
     (Jelmer Vernooij)
 
   * Fix repeat HTTP requests using the same smart HTTP client.
     (Jelmer Vernooij)
 
   * New 'client.PLinkSSHVendor' for creating connections using PuTTY's plink.exe.
     (Adam Bradley, Filipp Frizzy)
 
   * Only pass in `key_filename` and `password` to SSHVendor
     implementations if those parameters are set.
     (This helps with older SSHVendor implementations)
     (Jelmer Vernooij)
 
  API CHANGES
 
   * Index.iterblobs has been renamed to Index.iterobjects.
     (Jelmer Vernooij)
 
 0.19.0	2018-03-10
 
  BUG FIXES
 
   * Make `dulwich.archive` set the gzip header file modification time so that
     archives created from the same Git tree are always identical.
     (#577, Jonas Haag)
 
   * Allow comment characters (#, ;) within configuration file strings
     (Daniel Andersson, #579)
 
   * Raise exception when passing in invalid author/committer values
     to Repo.do_commit(). (Jelmer Vernooij, #602)
 
  IMPROVEMENTS
 
   * Add a fastimport ``extra``. (Jelmer Vernooij)
 
   * Start writing reflog entries. (Jelmer Vernooij)
 
   * Add ability to use password and keyfile ssh options with SSHVendor. (Filipp Kucheryavy)
 
   * Add ``change_type_same`` flag to ``tree_changes``.
     (Jelmer Vernooij)
 
  API CHANGES
 
   * ``GitClient.send_pack`` now accepts a ``generate_pack_data``
     rather than a ``generate_pack_contents`` function for
     performance reasons. (Jelmer Vernooij)
 
   * Dulwich now uses urllib3 internally for HTTP requests.
     The `opener` argument to `dulwich.client.HttpGitClient` that took a
     `urllib2` opener instance has been replaced by a `pool_manager` argument
     that takes a `urllib3` pool manager instance.
     (Daniel Andersson)
 
 0.18.6	2017-11-11
 
  BUG FIXES
 
   * Fix handling of empty repositories in ``porcelain.clone``.
     (#570, Jelmer Vernooij)
 
   * Raise an error when attempting to add paths that are not under the
     repository. (Jelmer Vernooij)
 
   * Fix error message for missing trailing ]. (Daniel Andersson)
 
   * Raise EmptyFileException when corruption (in the form of an empty
     file) is detected. (Antoine R. Dumont, #582)
 
   IMPROVEMENTS
 
   * Enforce date field parsing consistency. This also add checks on
     those date fields for potential overflow.
     (Antoine R. Dumont, #567)
 
 0.18.5	2017-10-29
 
  BUG FIXES
 
   * Fix cwd for hooks. (Fabian Grünbichler)
 
   * Fix setting of origin in config when non-standard origin is passed into
     ``Repo.clone``. (Kenneth Lareau, #565)
 
   * Prevent setting SSH arguments from SSH URLs when using SSH through a
     subprocess. Note that Dulwich doesn't support cloning submodules.
     (CVE-2017-16228) (Jelmer Vernooij)
 
  IMPROVEMENTS
 
   * Silently ignored directories in ``Repo.stage``.
     (Jelmer Vernooij, #564)
 
  API CHANGES
 
   * GitFile now raises ``FileLocked`` when encountering a lock
     rather than OSError(EEXIST). (Jelmer Vernooij)
 
 0.18.4	2017-10-01
 
  BUG FIXES
 
   * Make default User-Agent start with "git/" because GitHub won't response to
     HTTP smart server requests otherwise (and reply with a 404).
     (Jelmer vernooij, #562)
 
 0.18.3	2017-09-03
 
  BUG FIXES
 
   * Read config during porcelain operations that involve remotes.
     (Jelmer Vernooij, #545)
 
   * Fix headers of empty chunks in unified diffs. (Taras Postument, #543)
 
   * Properly follow redirects over HTTP. (Jelmer Vernooij, #117)
 
  IMPROVEMENTS
 
   * Add ``dulwich.porcelain.update_head``. (Jelmer Vernooij, #439)
 
   * ``GitClient.fetch_pack`` now returns symrefs.
     (Jelmer Vernooij, #485)
 
   * The server now supports providing symrefs.
     (Jelmer Vernooij, #485)
 
   * Add ``dulwich.object_store.commit_tree_changes`` to incrementally
     commit changes to a tree structure. (Jelmer Vernooij)
 
   * Add basic ``PackBasedObjectStore.repack`` method.
     (Jelmer Vernooij, Earl Chew, #296, #549, #552)
 
 0.18.2	2017-08-01
 
  TEST FIXES
 
   * Use constant timestamp so tests pass in all timezones, not just BST.
     (Jelmer Vernooij)
 
 0.18.1	2017-07-31
 
  BUG FIXES
 
   * Fix syntax error in dulwich.contrib.test_swift_smoke.
     (Jelmer Vernooij)
 
 0.18.0	2017-07-31
 
  BUG FIXES
 
   * Fix remaining tests on Windows. (Jelmer Vernooij, #493)
 
   * Fix build of C extensions with Python 3 on Windows.
     (Jelmer Vernooij)
 
   * Pass 'mkdir' argument onto Repo.init_bare in Repo.clone.
     (Jelmer Vernooij, #504)
 
   * In ``dulwich.porcelain.add``, if no files are specified,
     add from current working directory rather than repository root.
     (Jelmer Vernooij, #521)
 
   * Properly deal with submodules in 'porcelain.status'.
     (Jelmer Vernooij, #517)
 
   * ``dulwich.porcelain.remove`` now actually removes files from
     disk, not just from the index. (Jelmer Vernooij, #488)
 
   * Fix handling of "reset" command with markers and without
     "from". (Antoine Pietri)
 
   * Fix handling of "merge" command with markers. (Antoine Pietri)
 
   * Support treeish argument to porcelain.reset(), rather than
     requiring a ref/commit id. (Jelmer Vernooij)
 
   * Handle race condition when mtime doesn't change between writes/reads.
     (Jelmer Vernooij, #541)
 
   * Fix ``dulwich.porcelain.show`` on commits with Python 3.
     (Jelmer Vernooij, #532)
 
  IMPROVEMENTS
 
   * Add basic support for reading ignore files in ``dulwich.ignore``.
     ``dulwich.porcelain.add`` and ``dulwich.porcelain.status`` now honor
     ignores. (Jelmer Vernooij, Segev Finer, #524, #526)
 
   * New ``dulwich.porcelain.check_ignore`` command.
     (Jelmer Vernooij)
 
   * ``dulwich.porcelain.status`` now supports a ``ignored`` argument.
     (Jelmer Vernooij)
 
  DOCUMENTATION
 
   * Clarified docstrings for Client.{send_pack,fetch_pack} implementations.
     (Jelmer Vernooij, #523)
 
 0.17.3	2017-03-20
 
  PLATFORM SUPPORT
 
   * List Python 3.3 as supported. (Jelmer Vernooij, #513)
 
  BUG FIXES
 
   * Fix compatibility with pypy 3. (Jelmer Vernooij)
 
 0.17.2	2017-03-19
 
  BUG FIXES
 
   * Add workaround for
     https://bitbucket.org/pypy/pypy/issues/2499/cpyext-pystring_asstring-doesnt-work,
     fixing Dulwich when used with C extensions on pypy < 5.6. (Victor Stinner)
 
   * Properly quote config values with a '#' character in them.
     (Jelmer Vernooij, #511)
 
 0.17.1	2017-03-01
 
  IMPROVEMENTS
 
   * Add basic 'dulwich pull' command. (Jelmer Vernooij)
 
  BUG FIXES
 
   * Cope with existing submodules during pull.
     (Jelmer Vernooij, #505)
 
 0.17.0	2017-03-01
 
  TEST FIXES
 
   * Skip test that requires sync to synchronize filesystems if os.sync is
     not available. (Koen Martens)
 
  IMPROVEMENTS
 
   * Implement MemoryRepo.{set_description,get_description}.
     (Jelmer Vernooij)
 
   * Raise exception in Repo.stage() when absolute paths are
     passed in. Allow passing in relative paths to
     porcelain.add().(Jelmer Vernooij)
 
  BUG FIXES
 
   * Handle multi-line quoted values in config files.
     (Jelmer Vernooij, #495)
 
   * Allow porcelain.clone of repository without HEAD.
     (Jelmer Vernooij, #501)
 
   * Support passing tag ids to Walker()'s include argument.
     (Jelmer Vernooij)
 
   * Don't strip trailing newlines from extra headers.
     (Nicolas Dandrimont)
 
   * Set bufsize=0 for subprocess interaction with SSH client.
     Fixes hangs on Python 3. (René Stern, #434)
 
   * Don't drop first slash for SSH paths, except for those
     starting with "~". (Jelmer Vernooij, René Stern, #463)
 
   * Properly log off after retrieving just refs.
     (Jelmer Vernooij)
 
 0.16.3	2016-01-14
 
  TEST FIXES
 
   * Remove racy check that relies on clock time changing between writes.
     (Jelmer Vernooij)
 
  IMPROVEMENTS
 
   * Add porcelain.remote_add. (Jelmer Vernooij)
 
 0.16.2	2016-01-14
 
  IMPROVEMENTS
 
   * Fixed failing test-cases on windows.
     (Koen Martens)
 
  API CHANGES
 
   * Repo is now a context manager, so that it can be easily
     closed using a ``with`` statement. (Søren Løvborg)
 
  TEST FIXES
 
   * Only run worktree list compat tests against git 2.7.0,
     when 'git worktree list' was introduced. (Jelmer Vernooij)
 
  BUG FIXES
 
   * Ignore filemode when building index when core.filemode
     is false.
     (Koen Martens)
 
   * Initialize core.filemode configuration setting by
     probing the filesystem for trustable permissions.
     (Koen Martens)
 
   * Fix ``porcelain.reset`` to respect the comittish argument.
     (Koen Martens)
 
   * Fix dulwich.porcelain.ls_remote() on Python 3.
     (#471, Jelmer Vernooij)
 
   * Allow both unicode and byte strings for host paths
     in dulwich.client. (#435, Jelmer Vernooij)
 
   * Add remote from porcelain.clone. (#466, Jelmer Vernooij)
 
   * Fix unquoting of credentials before passing to urllib2.
     (#475, Volodymyr Holovko)
 
   * Cope with submodules in `build_index_from_tree`.
     (#477, Jelmer Vernooij)
 
   * Handle deleted files in `get_unstaged_changes`.
     (#483, Doug Hellmann)
 
   * Don't overwrite files when they haven't changed in
     `build_file_from_blob`.
     (#479, Benoît HERVIER)
 
   * Check for existence of index file before opening pack.
     Fixes a race when new packs are being added.
     (#482, wme)
 
 0.16.1	2016-12-25
 
  BUG FIXES
 
   * Fix python3 compatibility for dulwich.contrib.release_robot.
     (Jelmer Vernooij)
 
 0.16.0	2016-12-24
 
  IMPROVEMENTS
 
   * Add support for worktrees. See `git-worktree(1)` and
     `gitrepository-layout(5)`. (Laurent Rineau)
 
   * Add support for `commondir` file in Git control
     directories. (Laurent Rineau)
 
   * Add support for passwords in HTTP URLs.
     (Jon Bain, Mika Mäenpää)
 
   * Add `release_robot` script to contrib,
     allowing easy finding of current version based on Git tags.
     (Mark Mikofski)
 
   * Add ``Blob.splitlines`` method.
     (Jelmer Vernooij)
 
  BUG FIXES
 
   * Fix handling of ``Commit.tree`` being set to an actual
     tree object rather than a tree id. (Jelmer Vernooij)
 
   * Return remote refs from LocalGitClient.fetch_pack(),
     consistent with the documentation for that method.
     (#461, Jelmer Vernooij)
 
   * Fix handling of unknown URL schemes in get_transport_and_path.
     (#465, Jelmer Vernooij)
 
 0.15.0	2016-10-09
 
  BUG FIXES
 
   * Allow missing trailing LF when reading service name from
     HTTP servers. (Jelmer Vernooij, Andrew Shadura, #442)
 
   * Fix dulwich.porcelain.pull() on Python3. (Jelmer Vernooij, #451)
 
   * Properly pull in tags during dulwich.porcelain.clone.
     (Jelmer Vernooij, #408)
 
  CHANGES
 
   * Changed license from "GNU General Public License, version 2.0 or later"
     to "Apache License, version 2.0 or later or GNU General Public License,
     version 2.0 or later". (#153)
 
  IMPROVEMENTS
 
   * Add ``dulwich.porcelain.ls_tree`` implementation. (Jelmer Vernooij)
 
 0.14.1	2016-07-05
 
  BUG FIXES
 
   * Fix regression removing untouched refs when pushing over SSH.
     (Jelmer Vernooij #441)
 
   * Skip Python3 tests for SWIFT contrib module, as it has not yet
     been ported.
 
 0.14.0	2016-07-03
 
  BUG FIXES
 
   * Fix ShaFile.id after modification of a copied ShaFile.
     (Félix Mattrat, Jelmer Vernooij)
 
   * Support removing refs from porcelain.push.
     (Jelmer Vernooij, #437)
 
   * Stop magic protocol ref `capabilities^{}` from leaking out
     to clients. (Jelmer Vernooij, #254)
 
  IMPROVEMENTS
 
   * Add `dulwich.config.parse_submodules` function.
 
   * Add `RefsContainer.follow` method. (#438)
 
 0.13.0	2016-04-24
 
  IMPROVEMENTS
 
   * Support `ssh://` URLs in get_transport_and_path_from_url().
     (Jelmer Vernooij, #402)
 
   * Support missing empty line after headers in Git commits and tags.
     (Nicolas Dandrimont, #413)
 
   * Fix `dulwich.porcelain.status` when used in empty trees.
     (Jelmer Vernooij, #415)
 
   * Return copies of objects in MemoryObjectStore rather than
     references, making the behaviour more consistent with that of
     DiskObjectStore. (Félix Mattrat, Jelmer Vernooij)
 
   * Fix ``dulwich.web`` on Python3. (#295, Jonas Haag)
 
  CHANGES
 
   * Drop support for Python 2.6.
 
   * Fix python3 client web support. (Jelmer Vernooij)
 
  BUG FIXES
 
   * Fix hang on Gzip decompression. (Jonas Haag)
 
   * Don't rely on working tell() and seek() methods
     on wsgi.input. (Jonas Haag)
 
   * Support fastexport/fastimport functionality on python3 with newer
     versions of fastimport (>= 0.9.5). (Jelmer Vernooij, Félix Mattrat)
 
 0.12.0	2015-12-13
 
  IMPROVEMENTS
 
   * Add a `dulwich.archive` module that can create tarballs.
     Based on code from Jonas Haag in klaus.
 
   * Add a `dulwich.reflog` module for reading and writing reflogs.
     (Jelmer Vernooij)
 
   * Fix handling of ambiguous refs in `parse_ref` to make
     it match the behaviour described in https://git-scm.com/docs/gitrevisions.
     (Chris Bunney)
 
   * Support Python3 in C modules. (Lele Gaifax)
 
  BUG FIXES
 
   * Simplify handling of SSH command invocation.
     Fixes quoting of paths. Thanks, Thomas Liebetraut. (#384)
 
   * Fix inconsistent handling of trailing slashes for DictRefsContainer. (#383)
 
   * Add hack to support thin packs duing fetch(), albeit while requiring the
     entire pack file to be loaded into memory. (jsbain)
 
  CHANGES
 
   * This will be the last release to support Python 2.6.
 
 0.11.2	2015-09-18
 
  IMPROVEMENTS
 
   * Add support for agent= capability. (Jelmer Vernooij, #298)
 
   * Add support for quiet capability. (Jelmer Vernooij)
 
  CHANGES
 
   * The ParamikoSSHVendor class has been moved to
   * dulwich.contrib.paramiko_vendor, as it's currently untested.
     (Jelmer Vernooij, #364)
 
 0.11.1	2015-09-13
 
  Fix-up release to exclude broken blame.py file.
 
 0.11.0	2015-09-13
 
  IMPROVEMENTS
 
   * Extended Python3 support to most of the codebase.
     (Gary van der Merwe, Jelmer Vernooij)
   * The `Repo` object has a new `close` method that can be called to close any
     open resources. (Gary van der Merwe)
   * Support 'git.bat' in SubprocessGitClient on Windows.
     (Stefan Zimmermann)
   * Advertise 'ofs-delta' capability in receive-pack server side
     capabilities. (Jelmer Vernooij)
   * Switched `default_local_git_client_cls` to `LocalGitClient`.
     (Gary van der Merwe)
   * Add `porcelain.ls_remote` and `GitClient.get_refs`.
     (Michael Edgar)
   * Add `Repo.discover` method. (B. M. Corser)
   * Add `dulwich.objectspec.parse_refspec`. (Jelmer Vernooij)
   * Add `porcelain.pack_objects` and `porcelain.repack`.
     (Jelmer Vernooij)
 
  BUG FIXES
 
   * Fix handling of 'done' in graph walker and implement the
     'no-done' capability. (Tommy Yu, #88)
 
   * Avoid recursion limit issues resolving deltas. (William Grant, #81)
 
   * Allow arguments in local client binary path overrides.
     (Jelmer Vernooij)
 
   * Fix handling of commands with arguments in paramiko SSH
     client. (Andreas Klöckner, Jelmer Vernooij, #363)
 
   * Fix parsing of quoted strings in configs. (Jelmer Vernooij, #305)
 
 0.10.1  2015-03-25
 
  BUG FIXES
 
   * Return `ApplyDeltaError` when encountering delta errors
     in both C extensions and native delta application code.
     (Jelmer Vernooij, #259)
 
 0.10.0	2015-03-22
 
  BUG FIXES
 
   * In dulwich.index.build_index_from_tree, by default
     refuse to create entries that start with .git/.
 
   * Fix running of testsuite when installed.
     (Jelmer Vernooij, #223)
 
   * Use a block cache in _find_content_rename_candidates(),
     improving performance. (Mike Williams)
 
   * Add support for ``core.protectNTFS`` setting.
     (Jelmer Vernooij)
 
   * Fix TypeError when fetching empty updates.
     (Hwee Miin Koh)
 
   * Resolve delta refs when pulling into a MemoryRepo.
     (Max Shawabkeh, #256)
 
   * Fix handling of tags of non-commits in missing object finder.
     (Augie Fackler, #211)
 
   * Explicitly disable mmap on plan9 where it doesn't work.
     (Jeff Sickel)
 
  IMPROVEMENTS
 
   * New public method `Repo.reset_index`. (Jelmer Vernooij)
 
   * Prevent duplicate parsing of loose files in objects
     directory when reading. Thanks to David Keijser for the
     report. (Jelmer Vernooij, #231)
 
 0.9.9	2015-03-20
 
  SECURITY BUG FIXES
 
   * Fix buffer overflow in C implementation of pack apply_delta().
     (CVE-2015-0838)
 
     Thanks to Ivan Fratric of the Google Security Team for
     reporting this issue.
     (Jelmer Vernooij)
 
 0.9.8	2014-11-30
 
  BUG FIXES
 
   * Various fixes to improve test suite running on Windows.
     (Gary van der Merwe)
 
   * Limit delta copy length to 64K in v2 pack files. (Robert Brown)
 
   * Strip newline from final ACKed SHA while fetching packs.
     (Michael Edgar)
 
   * Remove assignment to PyList_SIZE() that was causing segfaults on
     pypy. (Jelmer Vernooij, #196)
 
  IMPROVEMENTS
 
   * Add porcelain 'receive-pack' and 'upload-pack'. (Jelmer Vernooij)
 
   * Handle SIGINT signals in bin/dulwich. (Jelmer Vernooij)
 
   * Add 'status' support to bin/dulwich. (Jelmer Vernooij)
 
   * Add 'branch_create', 'branch_list', 'branch_delete' porcelain.
     (Jelmer Vernooij)
 
   * Add 'fetch' porcelain. (Jelmer Vernooij)
 
   * Add 'tag_delete' porcelain. (Jelmer Vernooij)
 
   * Add support for serializing/deserializing 'gpgsig' attributes in Commit.
     (Jelmer Vernooij)
 
  CHANGES
 
   * dul-web is now available as 'dulwich web-daemon'.
     (Jelmer Vernooij)
 
   * dulwich.porcelain.tag has been renamed to tag_create.
     dulwich.porcelain.list_tags has been renamed to tag_list.
     (Jelmer Vernooij)
 
  API CHANGES
 
   * Restore support for Python 2.6. (Jelmer Vernooij, Gary van der Merwe)
 
 
 0.9.7	2014-06-08
 
  BUG FIXES
 
   * Fix tests dependent on hash ordering. (Michael Edgar)
 
   * Support staging symbolic links in Repo.stage.
     (Robert Brown)
 
   * Ensure that all files object are closed when running the test suite.
     (Gary van der Merwe)
 
   * When writing OFS_DELTA pack entries, write correct offset.
     (Augie Fackler)
 
   * Fix handler of larger copy operations in packs. (Augie Fackler)
 
   * Various fixes to improve test suite running on Windows.
     (Gary van der Merwe)
 
   * Fix logic for extra adds of identical files in rename detector.
     (Robert Brown)
 
  IMPROVEMENTS
 
   * Add porcelain 'status'. (Ryan Faulkner)
 
   * Add porcelain 'daemon'. (Jelmer Vernooij)
 
   * Add `dulwich.greenthreads` module which provides support
     for concurrency of some object store operations.
     (Fabien Boucher)
 
   * Various changes to improve compatibility with Python 3.
     (Gary van der Merwe, Hannu Valtonen, michael-k)
 
   * Add OpenStack Swift backed repository implementation
     in dulwich.contrib. See README.swift for details. (Fabien Boucher)
 
 API CHANGES
 
   * An optional close function can be passed to the Protocol class. This will
     be called by its close method. (Gary van der Merwe)
 
   * All classes with close methods are now context managers, so that they can
     be easily closed using a `with` statement. (Gary van der Merwe)
 
   * Remove deprecated `num_objects` argument to `write_pack` methods.
     (Jelmer Vernooij)
 
  OTHER CHANGES
 
   * The 'dul-daemon' script has been removed. The same functionality
     is now available as 'dulwich daemon'. (Jelmer Vernooij)
 
 0.9.6	2014-04-23
 
  IMPROVEMENTS
 
   * Add support for recursive add in 'git add'.
     (Ryan Faulkner, Jelmer Vernooij)
 
   * Add porcelain 'list_tags'. (Ryan Faulkner)
 
   * Add porcelain 'push'. (Ryan Faulkner)
 
   * Add porcelain 'pull'. (Ryan Faulkner)
 
   * Support 'http.proxy' in HttpGitClient.
     (Jelmer Vernooij, #1096030)
 
   * Support 'http.useragent' in HttpGitClient.
     (Jelmer Vernooij)
 
   * In server, wait for clients to send empty list of
     wants when talking to empty repository.
     (Damien Tournoud)
 
   * Various changes to improve compatibility with
     Python 3. (Gary van der Merwe)
 
  BUG FIXES
 
   * Support unseekable 'wsgi.input' streams.
     (Jonas Haag)
 
   * Raise TypeError when passing unicode() object
     to Repo.__getitem__.
     (Jonas Haag)
 
   * Fix handling of `reset` command in dulwich.fastexport.
     (Jelmer Vernooij, #1249029)
 
   * In client, don't wait for server to close connection
     first. Fixes hang when used against GitHub
     server implementation. (Siddharth Agarwal)
 
   * DeltaChainIterator: fix a corner case where an object is inflated as an
     object already in the repository.
     (Damien Tournoud, #135)
 
   * Stop leaking file handles during pack reload. (Damien Tournoud)
 
   * Avoid reopening packs during pack cache reload. (Jelmer Vernooij)
 
  API CHANGES
 
   * Drop support for Python 2.6. (Jelmer Vernooij)
 
 0.9.5	2014-02-23
 
  IMPROVEMENTS
 
   * Add porcelain 'tag'. (Ryan Faulkner)
 
   * New module `dulwich.objectspec` for parsing strings referencing
     objects and commit ranges. (Jelmer Vernooij)
 
   * Add shallow branch support. (milki)
 
   * Allow passing urllib2 `opener` into HttpGitClient.
     (Dov Feldstern, #909037)
 
  CHANGES
 
   * Drop support for Python 2.4 and 2.5. (Jelmer Vernooij)
 
  API CHANGES
 
   * Remove long deprecated ``Repo.commit``, ``Repo.get_blob``,
     ``Repo.tree`` and ``Repo.tag``. (Jelmer Vernooij)
 
   * Remove long deprecated ``Repo.revision_history`` and ``Repo.ref``.
     (Jelmer Vernooij)
 
   * Remove long deprecated ``Tree.entries``. (Jelmer Vernooij)
 
  BUG FIXES
 
   * Raise KeyError rather than TypeError when passing in
     unicode object of length 20 or 40 to Repo.__getitem__.
     (Jelmer Vernooij)
 
   * Use 'rm' rather than 'unlink' in tests, since the latter
     does not exist on OpenBSD and other platforms.
     (Dmitrij D. Czarkoff)
 
 0.9.4	2013-11-30
 
  IMPROVEMENTS
 
   * Add ssh_kwargs attribute to ParamikoSSHVendor. (milki)
 
   * Add Repo.set_description(). (Víðir Valberg Guðmundsson)
 
   * Add a basic `dulwich.porcelain` module. (Jelmer Vernooij, Marcin Kuzminski)
 
   * Various performance improvements for object access.
     (Jelmer Vernooij)
 
   * New function `get_transport_and_path_from_url`,
     similar to `get_transport_and_path` but only
     supports URLs.
     (Jelmer Vernooij)
 
   * Add support for file:// URLs in `get_transport_and_path_from_url`.
     (Jelmer Vernooij)
 
   * Add LocalGitClient implementation.
     (Jelmer Vernooij)
 
  BUG FIXES
 
   * Support filesystems with 64bit inode and device numbers.
     (André Roth)
 
  CHANGES
 
   * Ref handling has been moved to dulwich.refs.
     (Jelmer Vernooij)
 
  API CHANGES
 
   * Remove long deprecated RefsContainer.set_ref().
     (Jelmer Vernooij)
 
   * Repo.ref() is now deprecated in favour of Repo.refs[].
     (Jelmer Vernooij)
 
 FEATURES
 
   * Add support for graftpoints. (milki)
 
 0.9.3	2013-09-27
 
  BUG FIXES
 
   * Fix path for stdint.h in MANIFEST.in. (Jelmer Vernooij)
 
 0.9.2	2013-09-26
 
  BUG FIXES
 
   * Include stdint.h in MANIFEST.in (Mark Mikofski)
 
 0.9.1	2013-09-22
 
  BUG FIXES
 
   * Support lookups of 40-character refs in BaseRepo.__getitem__. (Chow Loong Jin, Jelmer Vernooij)
 
   * Fix fetching packs with side-band-64k capability disabled. (David Keijser, Jelmer Vernooij)
 
   * Several fixes in send-pack protocol behaviour - handling of empty pack files and deletes.
     (milki, #1063087)
 
   * Fix capability negotiation when fetching packs over HTTP.
     (#1072461, William Grant)
 
   * Enforce determine_wants returning an empty list rather than None. (Fabien Boucher, Jelmer Vernooij)
 
   * In the server, support pushes just removing refs. (Fabien Boucher, Jelmer Vernooij)
 
  IMPROVEMENTS
 
   * Support passing a single revision to BaseRepo.get_walker() rather than a list of revisions. 
     (Alberto Ruiz)
 
   * Add `Repo.get_description` method. (Jelmer Vernooij)
 
   * Support thin packs in Pack.iterobjects() and Pack.get_raw().
     (William Grant)
 
   * Add `MemoryObjectStore.add_pack` and `MemoryObjectStore.add_thin_pack` methods.
     (David Bennett)
 
   * Add paramiko-based SSH vendor. (Aaron O'Mullan)
 
   * Support running 'dulwich.server' and 'dulwich.web' using 'python -m'.
     (Jelmer Vernooij)
 
   * Add ObjectStore.close(). (Jelmer Vernooij)
 
   * Raise appropriate NotImplementedError when encountering dumb HTTP servers.
     (Jelmer Vernooij)
 
  API CHANGES
 
   * SSHVendor.connect_ssh has been renamed to SSHVendor.run_command.
     (Jelmer Vernooij)
 
   * ObjectStore.add_pack() now returns a 3-tuple. The last element will be an
     abort() method that can be used to cancel the pack operation.
     (Jelmer Vernooij)
 
 0.9.0	2013-05-31
 
  BUG FIXES
 
   * Push efficiency - report missing objects only. (#562676, Artem Tikhomirov)
 
   * Use indentation consistent with C Git in config files.
     (#1031356, Curt Moore, Jelmer Vernooij)
 
   * Recognize and skip binary files in diff function.
     (Takeshi Kanemoto)
 
   * Fix handling of relative paths in dulwich.client.get_transport_and_path.
     (Brian Visel, #1169368)
 
   * Preserve ordering of entries in configuration.
     (Benjamin Pollack)
 
   * Support ~ expansion in SSH client paths. (milki, #1083439)
 
   * Support relative paths in alternate paths.
     (milki, Michel Lespinasse, #1175007)
 
   * Log all error messages from wsgiref server to the logging module. This
     makes the test suit quiet again. (Gary van der Merwe)
 
   * Support passing None for empty tree in changes_from_tree.
     (Kevin Watters)
 
   * Support fetching empty repository in client. (milki, #1060462)
 
  IMPROVEMENTS:
 
   * Add optional honor_filemode flag to build_index_from_tree.
     (Mark Mikofski)
 
   * Support core/filemode setting when building trees. (Jelmer Vernooij)
 
   * Add chapter on tags in tutorial. (Ryan Faulkner)
 
  FEATURES
 
   * Add support for mergetags. (milki, #963525)
 
   * Add support for posix shell hooks. (milki)
 
 0.8.7	2012-11-27
 
  BUG FIXES
 
   * Fix use of alternates in ``DiskObjectStore``.{__contains__,__iter__}.
     (Dmitriy)
 
   * Fix compatibility with Python 2.4. (David Carr)
 
 0.8.6	2012-11-09
 
  API CHANGES
 
   * dulwich.__init__ no longer imports client, protocol, repo and
     server modules. (Jelmer Vernooij)
 
  FEATURES
 
   * ConfigDict now behaves more like a dictionary.
     (Adam 'Cezar' Jenkins, issue #58)
 
   * HTTPGitApplication now takes an optional
     `fallback_app` argument. (Jonas Haag, issue #67)
 
   * Support for large pack index files. (Jameson Nash)
 
  TESTING
 
   * Make index entry tests a little bit less strict, to cope with
     slightly different behaviour on various platforms.
     (Jelmer Vernooij)
 
   * ``setup.py test`` (available when setuptools is installed) now
     runs all tests, not just the basic unit tests.
     (Jelmer Vernooij)
 
  BUG FIXES
 
   * Commit._deserialize now actually deserializes the current state rather than
     the previous one. (Yifan Zhang, issue #59)
 
   * Handle None elements in lists of TreeChange objects. (Alex Holmes)
 
   * Support cloning repositories without HEAD set.
     (D-Key, Jelmer Vernooij, issue #69)
 
   * Support ``MemoryRepo.get_config``. (Jelmer Vernooij)
 
   * In ``get_transport_and_path``, pass extra keyword arguments on to
     HttpGitClient. (Jelmer Vernooij)
 
 0.8.5	2012-03-29
 
  BUG FIXES
 
   * Avoid use of 'with' in dulwich.index. (Jelmer Vernooij)
 
   * Be a little bit strict about OS behaviour in index tests.
     Should fix the tests on Debian GNU/kFreeBSD. (Jelmer Vernooij)
 
 0.8.4	2012-03-28
 
  BUG FIXES
 
   * Options on the same line as sections in config files are now supported.
     (Jelmer Vernooij, #920553)
 
   * Only negotiate capabilities that are also supported by the server.
     (Rod Cloutier, Risto Kankkunen)
 
   * Fix parsing of invalid timezone offsets with two minus signs.
     (Jason R. Coombs, #697828)
 
   * Reset environment variables during tests, to avoid
     test isolation leaks reading ~/.gitconfig. (Risto Kankkunen)
 
  TESTS
 
   * $HOME is now explicitly specified for tests that use it to read
     ``~/.gitconfig``, to prevent test isolation issues.
     (Jelmer Vernooij, #920330)
 
  FEATURES
 
   * Additional arguments to get_transport_and_path are now passed
     on to the constructor of the transport. (Sam Vilain)
 
   * The WSGI server now transparently handles when a git client submits data
     using Content-Encoding: gzip.
     (David Blewett, Jelmer Vernooij)
 
   * Add dulwich.index.build_index_from_tree(). (milki)
 
 0.8.3	2012-01-21
 
  FEATURES
 
   * The config parser now supports the git-config file format as
     described in git-config(1) and can write git config files.
     (Jelmer Vernooij, #531092, #768687)
 
   * ``Repo.do_commit`` will now use the user identity from
     .git/config or ~/.gitconfig if none was explicitly specified.
     (Jelmer Vernooij)
 
  BUG FIXES
 
   * Allow ``determine_wants`` methods to include the zero sha in their
     return value. (Jelmer Vernooij)
 
 0.8.2	2011-12-18
 
  BUG FIXES
 
   * Cope with different zlib buffer sizes in sha1 file parser.
     (Jelmer Vernooij)
 
   * Fix get_transport_and_path for HTTP/HTTPS URLs.
     (Bruno Renié)
 
   * Avoid calling free_objects() on NULL in error cases. (Chris Eberle)
 
   * Fix use --bare argument to 'dulwich init'. (Chris Eberle)
 
   * Properly abort connections when the determine_wants function
     raises an exception. (Jelmer Vernooij, #856769)
 
   * Tweak xcodebuild hack to deal with more error output.
     (Jelmer Vernooij, #903840)
 
  FEATURES
 
   * Add support for retrieving tarballs from remote servers.
     (Jelmer Vernooij, #379087)
 
   * New method ``update_server_info`` which generates data
     for dumb server access. (Jelmer Vernooij, #731235)
 
 0.8.1	2011-10-31
 
  FEATURES
 
   * Repo.do_commit has a new argument 'ref'.
 
   * Repo.do_commit has a new argument 'merge_heads'. (Jelmer Vernooij)
 
   * New ``Repo.get_walker`` method. (Jelmer Vernooij)
 
   * New ``Repo.clone`` method. (Jelmer Vernooij, #725369)
 
   * ``GitClient.send_pack`` now supports the 'side-band-64k' capability.
     (Jelmer Vernooij)
 
   * ``HttpGitClient`` which supports the smart server protocol over
     HTTP. "dumb" access is not yet supported. (Jelmer Vernooij, #373688)
 
   * Add basic support for alternates. (Jelmer Vernooij, #810429)
 
  CHANGES
 
   * unittest2 or python >= 2.7 is now required for the testsuite.
     testtools is no longer supported. (Jelmer Vernooij, #830713)
 
  BUG FIXES
 
   * Fix compilation with older versions of MSVC.  (Martin gz)
 
   * Special case 'refs/stash' as a valid ref. (Jelmer Vernooij, #695577)
 
   * Smart protocol clients can now change refs even if they are
     not uploading new data. (Jelmer Vernooij, #855993)
 
   * Don't compile C extensions when running in pypy.
     (Ronny Pfannschmidt, #881546)
 
   * Use different name for strnlen replacement function to avoid clashing
     with system strnlen. (Jelmer Vernooij, #880362)
 
  API CHANGES
 
   * ``Repo.revision_history`` is now deprecated in favor of ``Repo.get_walker``.
     (Jelmer Vernooij)
 
 0.8.0	2011-08-07
 
  FEATURES
 
   * New DeltaChainIterator abstract class for quickly iterating all objects in
     a pack, with implementations for pack indexing and inflation.
     (Dave Borowitz)
 
   * New walk module with a Walker class for customizable commit walking.
     (Dave Borowitz)
 
   * New tree_changes_for_merge function in diff_tree. (Dave Borowitz)
 
   * Easy rename detection in RenameDetector even without find_copies_harder.
     (Dave Borowitz)
 
  BUG FIXES
 
   * Avoid storing all objects in memory when writing pack.
     (Jelmer Vernooij, #813268)
 
   * Support IPv6 for git:// connections. (Jelmer Vernooij, #801543)
 
   * Improve performance of Repo.revision_history(). (Timo Schmid, #535118)
 
   * Fix use of SubprocessWrapper on Windows. (Paulo Madeira, #670035)
 
   * Fix compilation on newer versions of Mac OS X (Lion and up). (Ryan McKern, #794543)
 
   * Prevent raising ValueError for correct refs in RefContainer.__delitem__.
 
   * Correctly return a tuple from MemoryObjectStore.get_raw. (Dave Borowitz)
 
   * Fix a bug in reading the pack checksum when there are fewer than 20 bytes
     left in the buffer. (Dave Borowitz)
 
   * Support ~ in git:// URL paths. (Jelmer Vernooij, #813555)
 
   * Make ShaFile.__eq__ work when other is not a ShaFile. (Dave Borowitz)
 
   * ObjectStore.get_graph_walker() now no longer yields the same
     revision more than once. This has a significant improvement for
     performance when wide revision graphs are involved.
     (Jelmer Vernooij, #818168)
 
   * Teach ReceivePackHandler how to read empty packs. (Dave Borowitz)
 
   * Don't send a pack with duplicates of the same object. (Dave Borowitz)
 
   * Teach the server how to serve a clone of an empty repo. (Dave Borowitz)
 
   * Correctly advertise capabilities during receive-pack. (Dave Borowitz)
 
   * Fix add/add and add/rename conflicts in tree_changes_for_merge.
     (Dave Borowitz)
 
   * Use correct MIME types in web server. (Dave Borowitz)
 
  API CHANGES
 
   * write_pack no longer takes the num_objects argument and requires an object
     to be passed in that is iterable (rather than an iterator) and that
     provides __len__.  (Jelmer Vernooij)
 
   * write_pack_data has been renamed to write_pack_objects and no longer takes a
     num_objects argument. (Jelmer Vernooij)
 
   * take_msb_bytes, read_zlib_chunks, unpack_objects, and
     PackStreamReader.read_objects now take an additional argument indicating a
     crc32 to compute. (Dave Borowitz)
 
   * PackObjectIterator was removed; its functionality is still exposed by
     PackData.iterobjects. (Dave Borowitz)
 
   * Add a sha arg to write_pack_object to incrementally compute a SHA.
     (Dave Borowitz)
 
   * Include offset in PackStreamReader results. (Dave Borowitz)
 
   * Move PackStreamReader from server to pack. (Dave Borowitz)
 
   * Extract a check_length_and_checksum, compute_file_sha, and
     pack_object_header pack helper functions. (Dave Borowitz)
 
   * Extract a compute_file_sha function. (Dave Borowitz)
 
   * Remove move_in_thin_pack as a separate method; add_thin_pack now completes
     the thin pack and moves it in in one step. Remove ThinPackData as well.
     (Dave Borowitz)
 
   * Custom buffer size in read_zlib_chunks. (Dave Borowitz)
 
   * New UnpackedObject data class that replaces ad-hoc tuples in the return
     value of unpack_object and various DeltaChainIterator methods.
     (Dave Borowitz)
 
   * Add a lookup_path convenience method to Tree. (Dave Borowitz)
 
   * Optionally create RenameDetectors without passing in tree SHAs.
     (Dave Borowitz)
 
   * Optionally include unchanged entries in RenameDetectors. (Dave Borowitz)
 
   * Optionally pass a RenameDetector to tree_changes. (Dave Borowitz)
 
   * Optionally pass a request object through to server handlers. (Dave Borowitz)
 
  TEST CHANGES
 
   * If setuptools is installed, "python setup.py test" will now run the testsuite.
     (Jelmer Vernooij)
 
   * Add a new build_pack test utility for building packs from a simple spec.
     (Dave Borowitz)
 
   * Add a new build_commit_graph test utility for building commits from a
     simple spec. (Dave Borowitz)
 
 0.7.1	2011-04-12
 
  BUG FIXES
 
   * Fix double decref in _diff_tree.c. (Ted Horst, #715528)
 
   * Fix the build on Windows. (Pascal Quantin)
 
   * Fix get_transport_and_path compatibility with pre-2.6.5 versions of Python.
     (Max Bowsher, #707438)
 
   * BaseObjectStore.determine_wants_all no longer breaks on zero SHAs.
     (Jelmer Vernooij)
 
   * write_tree_diff() now supports submodules.
     (Jelmer Vernooij)
 
   * Fix compilation for XCode 4 and older versions of distutils.sysconfig.
     (Daniele Sluijters)
 
  IMPROVEMENTS
 
   * Sphinxified documentation. (Lukasz Balcerzak)
 
   * Add Pack.keep.(Marc Brinkmann)
 
  API CHANGES
 
   * The order of the parameters to Tree.add(name, mode, sha) has changed, and
     is now consistent with the rest of Dulwich. Existing code will still
     work but print a DeprecationWarning. (Jelmer Vernooij, #663550)
 
   * Tree.entries() is now deprecated in favour of Tree.items() and
     Tree.iteritems(). (Jelmer Vernooij)
 
 0.7.0	2011-01-21
 
  FEATURES
 
   * New `dulwich.diff_tree` module for simple content-based rename detection.
     (Dave Borowitz)
 
   * Add Tree.items(). (Jelmer Vernooij)
 
   * Add eof() and unread_pkt_line() methods to Protocol. (Dave Borowitz)
 
   * Add write_tree_diff(). (Jelmer Vernooij)
 
   * Add `serve_command` function for git server commands as executables.
     (Jelmer Vernooij)
 
   * dulwich.client.get_transport_and_path now supports rsync-style repository URLs.
     (Dave Borowitz, #568493)
 
  BUG FIXES
 
   * Correct short-circuiting operation for no-op fetches in the server.
     (Dave Borowitz)
 
   * Support parsing git mbox patches without a version tail, as generated by
     Mercurial.  (Jelmer Vernooij)
 
   * Fix dul-receive-pack and dul-upload-pack. (Jelmer Vernooij)
 
   * Zero-padded file modes in Tree objects no longer trigger an exception but
     the check code warns about them. (Augie Fackler, #581064)
 
   * Repo.init() now honors the mkdir flag. (#671159)
 
   * The ref format is now checked when setting a ref rather than when reading it back.
     (Dave Borowitz, #653527)
 
   * Make sure pack files are closed correctly. (Tay Ray Chuan)
 
  DOCUMENTATION
 
   * Run the tutorial inside the test suite. (Jelmer Vernooij)
 
   * Reorganized and updated the tutorial. (Jelmer Vernooij, Dave Borowitz, #610550,
      #610540)
 
 
 0.6.2	2010-10-16
 
  BUG FIXES
 
   * HTTP server correctly handles empty CONTENT_LENGTH. (Dave Borowitz)
 
   * Don't error when creating GitFiles with the default mode. (Dave Borowitz)
 
   * ThinPackData.from_file now works with resolve_ext_ref callback.
     (Dave Borowitz)
 
   * Provide strnlen() on mingw32 which doesn't have it. (Hans Kolek)
 
   * Set bare=true in the configuratin for bare repositories. (Dirk Neumann)
 
  FEATURES
 
   * Use slots for core objects to save up on memory. (Jelmer Vernooij)
 
   * Web server supports streaming progress/pack output. (Dave Borowitz)
 
   * New public function dulwich.pack.write_pack_header. (Dave Borowitz)
 
   * Distinguish between missing files and read errors in HTTP server.
     (Dave Borowitz)
 
   * Initial work on support for fastimport using python-fastimport.
     (Jelmer Vernooij)
 
   * New dulwich.pack.MemoryPackIndex class. (Jelmer Vernooij)
 
   * Delegate SHA peeling to the object store.  (Dave Borowitz)
 
  TESTS
 
   * Use GitFile when modifying packed-refs in tests. (Dave Borowitz)
 
   * New tests in test_web with better coverage and fewer ad-hoc mocks.
     (Dave Borowitz)
 
   * Standardize quote delimiters in test_protocol. (Dave Borowitz)
 
   * Fix use when testtools is installed. (Jelmer Vernooij)
 
   * Add trivial test for write_pack_header. (Jelmer Vernooij)
 
   * Refactor some of dulwich.tests.compat.server_utils. (Dave Borowitz)
 
   * Allow overwriting id property of objects in test utils. (Dave Borowitz)
 
   * Use real in-memory objects rather than stubs for server tests.
     (Dave Borowitz)
 
   * Clean up MissingObjectFinder. (Dave Borowitz)
 
  API CHANGES
 
   * ObjectStore.iter_tree_contents now walks contents in depth-first, sorted
     order. (Dave Borowitz)
 
   * ObjectStore.iter_tree_contents can optionally yield tree objects as well.
     (Dave Borowitz).
 
   * Add side-band-64k support to ReceivePackHandler. (Dave Borowitz)
 
   * Change server capabilities methods to classmethods. (Dave Borowitz)
 
   * Tweak server handler injection. (Dave Borowitz)
 
   * PackIndex1 and PackIndex2 now subclass FilePackIndex, which is 
     itself a subclass of PackIndex. (Jelmer Vernooij)
 
  DOCUMENTATION
 
   * Add docstrings for various functions in dulwich.objects. (Jelmer Vernooij)
 
   * Clean up docstrings in dulwich.protocol. (Dave Borowitz)
 
   * Explicitly specify allowed protocol commands to
     ProtocolGraphWalker.read_proto_line.  (Dave Borowitz)
 
   * Add utility functions to DictRefsContainer. (Dave Borowitz)
 
 
 0.6.1	2010-07-22
 
  BUG FIXES
 
   * Fix memory leak in C implementation of sorted_tree_items. (Dave Borowitz)
 
   * Use correct path separators for named repo files. (Dave Borowitz)
 
   * python > 2.7 and testtools-based test runners will now also pick up skipped
     tests correctly. (Jelmer Vernooij)
 
  FEATURES
 
   * Move named file initilization to BaseRepo. (Dave Borowitz)
 
   * Add logging utilities and git/HTTP server logging. (Dave Borowitz)
 
   * The GitClient interface has been cleaned up and instances are now reusable.
     (Augie Fackler)
 
   * Allow overriding paths to executables in GitSSHClient. 
     (Ross Light, Jelmer Vernooij, #585204)
 
   * Add PackBasedObjectStore.pack_loose_objects(). (Jelmer Vernooij)
 
  TESTS
 
   * Add tests for sorted_tree_items and C implementation. (Dave Borowitz)
 
   * Add a MemoryRepo that stores everything in memory. (Dave Borowitz)
 
   * Quiet logging output from web tests. (Dave Borowitz)
 
   * More flexible version checking for compat tests. (Dave Borowitz)
 
   * Compat tests for servers with and without side-band-64k. (Dave Borowitz)
 
  CLEANUP
 
   * Clean up file headers. (Dave Borowitz)
 
  TESTS
 
   * Use GitFile when modifying packed-refs in tests. (Dave Borowitz)
 
  API CHANGES
 
   * dulwich.pack.write_pack_index_v{1,2} now take a file-like object
     rather than a filename. (Jelmer Vernooij)
 
   * Make dul-daemon/dul-web trivial wrappers around server functionality.
     (Dave Borowitz)
 
   * Move reference WSGI handler to web.py. (Dave Borowitz)
 
   * Factor out _report_status in ReceivePackHandler. (Dave Borowitz)
 
   * Factor out a function to convert a line to a pkt-line. (Dave Borowitz)
 
 
 0.6.0	2010-05-22
 
 note: This list is most likely incomplete for 0.6.0.
 
  BUG FIXES
  
   * Fix ReceivePackHandler to disallow removing refs without delete-refs.
     (Dave Borowitz)
 
   * Deal with capabilities required by the client, even if they 
     can not be disabled in the server. (Dave Borowitz)
 
   * Fix trailing newlines in generated patch files.
     (Jelmer Vernooij)
 
   * Implement RefsContainer.__contains__. (Jelmer Vernooij)
 
   * Cope with \r in ref files on Windows. (
     http://github.com/jelmer/dulwich/issues/#issue/13, Jelmer Vernooij)
 
   * Fix GitFile breakage on Windows. (Anatoly Techtonik, #557585)
 
   * Support packed ref deletion with no peeled refs. (Augie Fackler)
 
   * Fix send pack when there is nothing to fetch. (Augie Fackler)
 
   * Fix fetch if no progress function is specified. (Augie Fackler)
 
   * Allow double-staging of files that are deleted in the index. 
     (Dave Borowitz)
 
   * Fix RefsContainer.add_if_new to support dangling symrefs.
     (Dave Borowitz)
 
   * Non-existant index files in non-bare repositories are now treated as 
     empty. (Dave Borowitz)
 
   * Always update ShaFile.id when the contents of the object get changed. 
     (Jelmer Vernooij)
 
   * Various Python2.4-compatibility fixes. (Dave Borowitz)
 
   * Fix thin pack handling. (Dave Borowitz)
  
  FEATURES
 
   * Add include-tag capability to server. (Dave Borowitz)
 
   * New dulwich.fastexport module that can generate fastexport 
     streams. (Jelmer Vernooij)
 
   * Implemented BaseRepo.__contains__. (Jelmer Vernooij)
 
   * Add __setitem__ to DictRefsContainer. (Dave Borowitz)
 
   * Overall improvements checking Git objects. (Dave Borowitz)
 
   * Packs are now verified while they are received. (Dave Borowitz)
 
  TESTS
 
   * Add framework for testing compatibility with C Git. (Dave Borowitz)
 
   * Add various tests for the use of non-bare repositories. (Dave Borowitz)
 
   * Cope with diffstat not being available on all platforms. 
     (Tay Ray Chuan, Jelmer Vernooij)
 
   * Add make_object and make_commit convenience functions to test utils.
     (Dave Borowitz)
 
  API BREAKAGES
 
   * The 'committer' and 'message' arguments to Repo.do_commit() have 
     been swapped. 'committer' is now optional. (Jelmer Vernooij)
 
   * Repo.get_blob, Repo.commit, Repo.tag and Repo.tree are now deprecated.
     (Jelmer Vernooij)
 
   * RefsContainer.set_ref() was renamed to RefsContainer.set_symbolic_ref(),
     for clarity. (Jelmer Vernooij)
 
  API CHANGES
 
   * The primary serialization APIs in dulwich.objects now work 
     with chunks of strings rather than with full-text strings. 
     (Jelmer Vernooij)
 
 0.5.02010-03-03
 
  BUG FIXES
 
   * Support custom fields in commits (readonly). (Jelmer Vernooij)
 
   * Improved ref handling. (Dave Borowitz)
 
   * Rework server protocol to be smarter and interoperate with cgit client.
     (Dave Borowitz)
 
   * Add a GitFile class that uses the same locking protocol for writes as 
     cgit. (Dave Borowitz)
 
   * Cope with forward slashes correctly in the index on Windows.
     (Jelmer Vernooij, #526793)
 
  FEATURES
 
   * --pure option to setup.py to allow building/installing without the C 
     extensions. (Hal Wine, Anatoly Techtonik, Jelmer Vernooij, #434326)
 
   * Implement Repo.get_config(). (Jelmer Vernooij, Augie Fackler)
 
   * HTTP dumb and smart server. (Dave Borowitz)
 
   * Add abstract baseclass for Repo that does not require file system 
     operations. (Dave Borowitz)
 
 0.4.1	2010-01-03
 
  FEATURES
 
   * Add ObjectStore.iter_tree_contents(). (Jelmer Vernooij)
 
   * Add Index.changes_from_tree(). (Jelmer Vernooij)
 
   * Add ObjectStore.tree_changes(). (Jelmer Vernooij)
 
   * Add functionality for writing patches in dulwich.patch.
     (Jelmer Vernooij)
 
 0.4.0	2009-10-07
 
  DOCUMENTATION
 
   * Added tutorial.
 
  API CHANGES
 
   * dulwich.object_store.tree_lookup_path will now return the mode and 
     sha of the object found rather than the object itself.
 
  BUG FIXES
 
   * Use binascii.hexlify / binascii.unhexlify for better performance.
 
   * Cope with extra unknown data in index files by ignoring it (for now).
 
   * Add proper error message when server unexpectedly hangs up. (#415843)
 
   * Correctly write opcode for equal in create_delta.
 
 0.3.3	2009-07-23
 
  FEATURES
 
   * Implement ShaFile.__hash__().
 
   * Implement Tree.__len__()
 
  BUG FIXES
   
   * Check for 'objects' and 'refs' directories
     when looking for a Git repository. (#380818)
 
 0.3.2	2009-05-20
 
  BUG FIXES
 
   * Support the encoding field in Commits.
   
   * Some Windows compatibility fixes.
 
   * Fixed several issues in commit support.
 
  FEATURES
 
   * Basic support for handling submodules.
 
 0.3.1	2009-05-13
 
  FEATURES
 
   * Implemented Repo.__getitem__, Repo.__setitem__ and Repo.__delitem__ to 
     access content.
 
  API CHANGES
 
   * Removed Repo.set_ref, Repo.remove_ref, Repo.tags, Repo.get_refs and 
     Repo.heads in favor of Repo.refs, a dictionary-like object for accessing
     refs.
 
  BUG FIXES
 
   * Removed import of 'sha' module in objects.py, which was causing 
     deprecation warnings on Python 2.6.
 
 0.3.0	2009-05-10
 
  FEATURES
 
   * A new function 'commit_tree' has been added that can commit a tree 
     based on an index.
 
  BUG FIXES
 
   * The memory usage when generating indexes has been significantly reduced.
  
   * A memory leak in the C implementation of parse_tree has been fixed.
 
   * The send-pack smart server command now works. (Thanks Scott Chacon)
 
   * The handling of short timestamps (less than 10 digits) has been fixed.
 
   * The handling of timezones has been fixed.
 
 0.2.1	2009-04-30
 
  BUG FIXES
 
   * Fix compatibility with Python2.4.
 
 0.2.0	2009-04-30
 
  FEATURES
 
   * Support for activity reporting in smart protocol client.
 
   * Optional C extensions for better performance in a couple of 
     places that are performance-critical.
 
 0.1.1	2009-03-13
 
  BUG FIXES
 
   * Fixed regression in Repo.find_missing_objects()
 
   * Don't fetch ^{} objects from remote hosts, as requesting them 
     causes a hangup.
 
   * Always write pack to disk completely before calculating checksum.
 
  FEATURES
 
   * Allow disabling thin packs when talking to remote hosts.
 
 0.1.0	2009-01-24
 
   * Initial release.
diff --git a/dulwich/index.py b/dulwich/index.py
index 1b2289f6..3101a27f 100644
--- a/dulwich/index.py
+++ b/dulwich/index.py
@@ -1,841 +1,842 @@
 # index.py -- File parser/writer for the git index file
 # Copyright (C) 2008-2013 Jelmer Vernooij <jelmer@jelmer.uk>
 #
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or
 # modify it under the terms of either of these two licenses.
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # You should have received a copy of the licenses; if not, see
 # <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
 # and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
 # License, Version 2.0.
 #
 
 """Parser for the git index file format."""
 
 import collections
 import errno
 import os
 import stat
 import struct
 import sys
 
 from dulwich.file import GitFile
 from dulwich.objects import (
     Blob,
     S_IFGITLINK,
     S_ISGITLINK,
     Tree,
     hex_to_sha,
     sha_to_hex,
     )
 from dulwich.pack import (
     SHA1Reader,
     SHA1Writer,
     )
 
 
 IndexEntry = collections.namedtuple(
     'IndexEntry', [
         'ctime', 'mtime', 'dev', 'ino', 'mode', 'uid', 'gid', 'size', 'sha',
         'flags'])
 
 
 FLAG_STAGEMASK = 0x3000
 FLAG_VALID = 0x8000
 FLAG_EXTENDED = 0x4000
 
 
 def pathsplit(path):
     """Split a /-delimited path into a directory part and a basename.
 
     Args:
       path: The path to split.
     Returns:
       Tuple with directory name and basename
     """
     try:
         (dirname, basename) = path.rsplit(b"/", 1)
     except ValueError:
         return (b"", path)
     else:
         return (dirname, basename)
 
 
 def pathjoin(*args):
     """Join a /-delimited path.
 
     """
     return b"/".join([p for p in args if p])
 
 
 def read_cache_time(f):
     """Read a cache time.
 
     Args:
       f: File-like object to read from
     Returns:
       Tuple with seconds and nanoseconds
     """
     return struct.unpack(">LL", f.read(8))
 
 
 def write_cache_time(f, t):
     """Write a cache time.
 
     Args:
       f: File-like object to write to
       t: Time to write (as int, float or tuple with secs and nsecs)
     """
     if isinstance(t, int):
         t = (t, 0)
     elif isinstance(t, float):
         (secs, nsecs) = divmod(t, 1.0)
         t = (int(secs), int(nsecs * 1000000000))
     elif not isinstance(t, tuple):
         raise TypeError(t)
     f.write(struct.pack(">LL", *t))
 
 
 def read_cache_entry(f):
     """Read an entry from a cache file.
 
     Args:
       f: File-like object to read from
     Returns:
       tuple with: device, inode, mode, uid, gid, size, sha, flags
     """
     beginoffset = f.tell()
     ctime = read_cache_time(f)
     mtime = read_cache_time(f)
     (dev, ino, mode, uid, gid, size, sha, flags, ) = \
         struct.unpack(">LLLLLL20sH", f.read(20 + 4 * 6 + 2))
     name = f.read((flags & 0x0fff))
     # Padding:
     real_size = ((f.tell() - beginoffset + 8) & ~7)
     f.read((beginoffset + real_size) - f.tell())
     return (name, ctime, mtime, dev, ino, mode, uid, gid, size,
             sha_to_hex(sha), flags & ~0x0fff)
 
 
 def write_cache_entry(f, entry):
     """Write an index entry to a file.
 
     Args:
       f: File object
       entry: Entry to write, tuple with:
         (name, ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags)
     """
     beginoffset = f.tell()
     (name, ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = entry
     write_cache_time(f, ctime)
     write_cache_time(f, mtime)
     flags = len(name) | (flags & ~0x0fff)
     f.write(struct.pack(
             b'>LLLLLL20sH', dev & 0xFFFFFFFF, ino & 0xFFFFFFFF,
             mode, uid, gid, size, hex_to_sha(sha), flags))
     f.write(name)
     real_size = ((f.tell() - beginoffset + 8) & ~7)
     f.write(b'\0' * ((beginoffset + real_size) - f.tell()))
 
 
 def read_index(f):
     """Read an index file, yielding the individual entries."""
     header = f.read(4)
     if header != b'DIRC':
         raise AssertionError("Invalid index file header: %r" % header)
     (version, num_entries) = struct.unpack(b'>LL', f.read(4 * 2))
     assert version in (1, 2)
     for i in range(num_entries):
         yield read_cache_entry(f)
 
 
 def read_index_dict(f):
     """Read an index file and return it as a dictionary.
 
     Args:
       f: File object to read from
     """
     ret = {}
     for x in read_index(f):
         ret[x[0]] = IndexEntry(*x[1:])
     return ret
 
 
 def write_index(f, entries):
     """Write an index file.
 
     Args:
       f: File-like object to write to
       entries: Iterable over the entries to write
     """
     f.write(b'DIRC')
     f.write(struct.pack(b'>LL', 2, len(entries)))
     for x in entries:
         write_cache_entry(f, x)
 
 
 def write_index_dict(f, entries):
     """Write an index file based on the contents of a dictionary.
 
     """
     entries_list = []
     for name in sorted(entries):
         entries_list.append((name,) + tuple(entries[name]))
     write_index(f, entries_list)
 
 
 def cleanup_mode(mode):
     """Cleanup a mode value.
 
     This will return a mode that can be stored in a tree object.
 
     Args:
       mode: Mode to clean up.
     """
     if stat.S_ISLNK(mode):
         return stat.S_IFLNK
     elif stat.S_ISDIR(mode):
         return stat.S_IFDIR
     elif S_ISGITLINK(mode):
         return S_IFGITLINK
     ret = stat.S_IFREG | 0o644
-    ret |= (mode & 0o111)
+    if mode & 0o100:
+        ret |= 0o111
     return ret
 
 
 class Index(object):
     """A Git Index file."""
 
     def __init__(self, filename):
         """Open an index file.
 
         Args:
           filename: Path to the index file
         """
         self._filename = filename
         self.clear()
         self.read()
 
     @property
     def path(self):
         return self._filename
 
     def __repr__(self):
         return "%s(%r)" % (self.__class__.__name__, self._filename)
 
     def write(self):
         """Write current contents of index to disk."""
         f = GitFile(self._filename, 'wb')
         try:
             f = SHA1Writer(f)
             write_index_dict(f, self._byname)
         finally:
             f.close()
 
     def read(self):
         """Read current contents of index from disk."""
         if not os.path.exists(self._filename):
             return
         f = GitFile(self._filename, 'rb')
         try:
             f = SHA1Reader(f)
             for x in read_index(f):
                 self[x[0]] = IndexEntry(*x[1:])
             # FIXME: Additional data?
             f.read(os.path.getsize(self._filename)-f.tell()-20)
             f.check_sha()
         finally:
             f.close()
 
     def __len__(self):
         """Number of entries in this index file."""
         return len(self._byname)
 
     def __getitem__(self, name):
         """Retrieve entry by relative path.
 
         Returns: tuple with (ctime, mtime, dev, ino, mode, uid, gid, size, sha,
             flags)
         """
         return self._byname[name]
 
     def __iter__(self):
         """Iterate over the paths in this index."""
         return iter(self._byname)
 
     def get_sha1(self, path):
         """Return the (git object) SHA1 for the object at a path."""
         return self[path].sha
 
     def get_mode(self, path):
         """Return the POSIX file mode for the object at a path."""
         return self[path].mode
 
     def iterobjects(self):
         """Iterate over path, sha, mode tuples for use with commit_tree."""
         for path in self:
             entry = self[path]
             yield path, entry.sha, cleanup_mode(entry.mode)
 
     def iterblobs(self):
         import warnings
         warnings.warn('Use iterobjects() instead.', PendingDeprecationWarning)
         return self.iterobjects()
 
     def clear(self):
         """Remove all contents from this index."""
         self._byname = {}
 
     def __setitem__(self, name, x):
         assert isinstance(name, bytes)
         assert len(x) == 10
         # Remove the old entry if any
         self._byname[name] = IndexEntry(*x)
 
     def __delitem__(self, name):
         assert isinstance(name, bytes)
         del self._byname[name]
 
     def iteritems(self):
         return self._byname.items()
 
     def items(self):
         return self._byname.items()
 
     def update(self, entries):
         for name, value in entries.items():
             self[name] = value
 
     def changes_from_tree(self, object_store, tree, want_unchanged=False):
         """Find the differences between the contents of this index and a tree.
 
         Args:
           object_store: Object store to use for retrieving tree contents
           tree: SHA1 of the root tree
           want_unchanged: Whether unchanged files should be reported
         Returns: Iterator over tuples with (oldpath, newpath), (oldmode,
             newmode), (oldsha, newsha)
         """
         def lookup_entry(path):
             entry = self[path]
-            return entry.sha, entry.mode
+            return entry.sha, cleanup_mode(entry.mode)
         for (name, mode, sha) in changes_from_tree(
                 self._byname.keys(), lookup_entry, object_store, tree,
                 want_unchanged=want_unchanged):
             yield (name, mode, sha)
 
     def commit(self, object_store):
         """Create a new tree from an index.
 
         Args:
           object_store: Object store to save the tree in
         Returns:
           Root tree SHA
         """
         return commit_tree(object_store, self.iterobjects())
 
 
 def commit_tree(object_store, blobs):
     """Commit a new tree.
 
     Args:
       object_store: Object store to add trees to
       blobs: Iterable over blob path, sha, mode entries
     Returns:
       SHA1 of the created tree.
     """
 
     trees = {b'': {}}
 
     def add_tree(path):
         if path in trees:
             return trees[path]
         dirname, basename = pathsplit(path)
         t = add_tree(dirname)
         assert isinstance(basename, bytes)
         newtree = {}
         t[basename] = newtree
         trees[path] = newtree
         return newtree
 
     for path, sha, mode in blobs:
         tree_path, basename = pathsplit(path)
         tree = add_tree(tree_path)
         tree[basename] = (mode, sha)
 
     def build_tree(path):
         tree = Tree()
         for basename, entry in trees[path].items():
             if isinstance(entry, dict):
                 mode = stat.S_IFDIR
                 sha = build_tree(pathjoin(path, basename))
             else:
                 (mode, sha) = entry
             tree.add(basename, mode, sha)
         object_store.add_object(tree)
         return tree.id
     return build_tree(b'')
 
 
 def commit_index(object_store, index):
     """Create a new tree from an index.
 
     Args:
       object_store: Object store to save the tree in
       index: Index file
     Note: This function is deprecated, use index.commit() instead.
     Returns: Root tree sha.
     """
     return commit_tree(object_store, index.iterobjects())
 
 
 def changes_from_tree(names, lookup_entry, object_store, tree,
                       want_unchanged=False):
     """Find the differences between the contents of a tree and
     a working copy.
 
     Args:
       names: Iterable of names in the working copy
       lookup_entry: Function to lookup an entry in the working copy
       object_store: Object store to use for retrieving tree contents
       tree: SHA1 of the root tree, or None for an empty tree
       want_unchanged: Whether unchanged files should be reported
     Returns: Iterator over tuples with (oldpath, newpath), (oldmode, newmode),
         (oldsha, newsha)
     """
     # TODO(jelmer): Support a include_trees option
     other_names = set(names)
 
     if tree is not None:
         for (name, mode, sha) in object_store.iter_tree_contents(tree):
             try:
                 (other_sha, other_mode) = lookup_entry(name)
             except KeyError:
                 # Was removed
                 yield ((name, None), (mode, None), (sha, None))
             else:
                 other_names.remove(name)
                 if (want_unchanged or other_sha != sha or other_mode != mode):
                     yield ((name, name), (mode, other_mode), (sha, other_sha))
 
     # Mention added files
     for name in other_names:
         try:
             (other_sha, other_mode) = lookup_entry(name)
         except KeyError:
             pass
         else:
             yield ((None, name), (None, other_mode), (None, other_sha))
 
 
 def index_entry_from_stat(stat_val, hex_sha, flags, mode=None):
     """Create a new index entry from a stat value.
 
     Args:
       stat_val: POSIX stat_result instance
       hex_sha: Hex sha of the object
       flags: Index flags
     """
     if mode is None:
         mode = cleanup_mode(stat_val.st_mode)
 
     return IndexEntry(
             stat_val.st_ctime, stat_val.st_mtime, stat_val.st_dev,
             stat_val.st_ino, mode, stat_val.st_uid,
             stat_val.st_gid, stat_val.st_size, hex_sha, flags)
 
 
 def build_file_from_blob(blob, mode, target_path, honor_filemode=True):
     """Build a file or symlink on disk based on a Git object.
 
     Args:
       obj: The git object
       mode: File mode
       target_path: Path to write to
       honor_filemode: An optional flag to honor core.filemode setting in
         config file, default is core.filemode=True, change executable bit
     Returns: stat object for the file
     """
     try:
         oldstat = os.lstat(target_path)
     except OSError as e:
         if e.errno == errno.ENOENT:
             oldstat = None
         else:
             raise
     contents = blob.as_raw_string()
     if stat.S_ISLNK(mode):
         # FIXME: This will fail on Windows. What should we do instead?
         if oldstat:
             os.unlink(target_path)
         if sys.platform == 'win32' and sys.version_info[0] == 3:
             # os.readlink on Python3 on Windows requires a unicode string.
             # TODO(jelmer): Don't assume tree_encoding == fs_encoding
             tree_encoding = sys.getfilesystemencoding()
             contents = contents.decode(tree_encoding)
             target_path = target_path.decode(tree_encoding)
         os.symlink(contents, target_path)
     else:
         if oldstat is not None and oldstat.st_size == len(contents):
             with open(target_path, 'rb') as f:
                 if f.read() == contents:
                     return oldstat
 
         with open(target_path, 'wb') as f:
             # Write out file
             f.write(contents)
 
         if honor_filemode:
             os.chmod(target_path, mode)
 
     return os.lstat(target_path)
 
 
 INVALID_DOTNAMES = (b".git", b".", b"..", b"")
 
 
 def validate_path_element_default(element):
     return element.lower() not in INVALID_DOTNAMES
 
 
 def validate_path_element_ntfs(element):
     stripped = element.rstrip(b". ").lower()
     if stripped in INVALID_DOTNAMES:
         return False
     if stripped == b"git~1":
         return False
     return True
 
 
 def validate_path(path, element_validator=validate_path_element_default):
     """Default path validator that just checks for .git/."""
     parts = path.split(b"/")
     for p in parts:
         if not element_validator(p):
             return False
     else:
         return True
 
 
 def build_index_from_tree(root_path, index_path, object_store, tree_id,
                           honor_filemode=True,
                           validate_path_element=validate_path_element_default):
     """Generate and materialize index from a tree
 
     Args:
       tree_id: Tree to materialize
       root_path: Target dir for materialized index files
       index_path: Target path for generated index
       object_store: Non-empty object store holding tree contents
       honor_filemode: An optional flag to honor core.filemode setting in
         config file, default is core.filemode=True, change executable bit
       validate_path_element: Function to validate path elements to check
         out; default just refuses .git and .. directories.
 
     Note: existing index is wiped and contents are not merged
         in a working dir. Suitable only for fresh clones.
     """
 
     index = Index(index_path)
     if not isinstance(root_path, bytes):
         root_path = root_path.encode(sys.getfilesystemencoding())
 
     for entry in object_store.iter_tree_contents(tree_id):
         if not validate_path(entry.path, validate_path_element):
             continue
         full_path = _tree_to_fs_path(root_path, entry.path)
 
         if not os.path.exists(os.path.dirname(full_path)):
             os.makedirs(os.path.dirname(full_path))
 
         # TODO(jelmer): Merge new index into working tree
         if S_ISGITLINK(entry.mode):
             if not os.path.isdir(full_path):
                 os.mkdir(full_path)
             st = os.lstat(full_path)
             # TODO(jelmer): record and return submodule paths
         else:
             obj = object_store[entry.sha]
             st = build_file_from_blob(
                 obj, entry.mode, full_path, honor_filemode=honor_filemode)
         # Add file to index
         if not honor_filemode or S_ISGITLINK(entry.mode):
             # we can not use tuple slicing to build a new tuple,
             # because on windows that will convert the times to
             # longs, which causes errors further along
             st_tuple = (entry.mode, st.st_ino, st.st_dev, st.st_nlink,
                         st.st_uid, st.st_gid, st.st_size, st.st_atime,
                         st.st_mtime, st.st_ctime)
             st = st.__class__(st_tuple)
         index[entry.path] = index_entry_from_stat(st, entry.sha, 0)
 
     index.write()
 
 
 def blob_from_path_and_stat(fs_path, st):
     """Create a blob from a path and a stat object.
 
     Args:
       fs_path: Full file system path to file
       st: A stat object
     Returns: A `Blob` object
     """
     assert isinstance(fs_path, bytes)
     blob = Blob()
     if not stat.S_ISLNK(st.st_mode):
         with open(fs_path, 'rb') as f:
             blob.data = f.read()
     else:
         if sys.platform == 'win32' and sys.version_info[0] == 3:
             # os.readlink on Python3 on Windows requires a unicode string.
             # TODO(jelmer): Don't assume tree_encoding == fs_encoding
             tree_encoding = sys.getfilesystemencoding()
             fs_path = fs_path.decode(tree_encoding)
             blob.data = os.readlink(fs_path).encode(tree_encoding)
         else:
             blob.data = os.readlink(fs_path)
     return blob
 
 
 def read_submodule_head(path):
     """Read the head commit of a submodule.
 
     Args:
       path: path to the submodule
     Returns: HEAD sha, None if not a valid head/repository
     """
     from dulwich.errors import NotGitRepository
     from dulwich.repo import Repo
     # Repo currently expects a "str", so decode if necessary.
     # TODO(jelmer): Perhaps move this into Repo() ?
     if not isinstance(path, str):
         path = path.decode(sys.getfilesystemencoding())
     try:
         repo = Repo(path)
     except NotGitRepository:
         return None
     try:
         return repo.head()
     except KeyError:
         return None
 
 
 def _has_directory_changed(tree_path, entry):
     """Check if a directory has changed after getting an error.
 
     When handling an error trying to create a blob from a path, call this
     function. It will check if the path is a directory. If it's a directory
     and a submodule, check the submodule head to see if it's has changed. If
     not, consider the file as changed as Git tracked a file and not a
     directory.
 
     Return true if the given path should be considered as changed and False
     otherwise or if the path is not a directory.
     """
     # This is actually a directory
     if os.path.exists(os.path.join(tree_path, b'.git')):
         # Submodule
         head = read_submodule_head(tree_path)
         if entry.sha != head:
             return True
     else:
         # The file was changed to a directory, so consider it removed.
         return True
 
     return False
 
 
 def get_unstaged_changes(index, root_path, filter_blob_callback=None):
     """Walk through an index and check for differences against working tree.
 
     Args:
       index: index to check
       root_path: path in which to find files
     Returns: iterator over paths with unstaged changes
     """
     # For each entry in the index check the sha1 & ensure not staged
     if not isinstance(root_path, bytes):
         root_path = root_path.encode(sys.getfilesystemencoding())
 
     for tree_path, entry in index.iteritems():
         full_path = _tree_to_fs_path(root_path, tree_path)
         try:
             st = os.lstat(full_path)
             if stat.S_ISDIR(st.st_mode):
                 if _has_directory_changed(tree_path, entry):
                     yield tree_path
                 continue
 
             blob = blob_from_path_and_stat(full_path, st)
 
             if filter_blob_callback is not None:
                 blob = filter_blob_callback(blob, tree_path)
         except EnvironmentError as e:
             if e.errno == errno.ENOENT:
                 # The file was removed, so we assume that counts as
                 # different from whatever file used to exist.
                 yield tree_path
             else:
                 raise
         else:
             if blob.id != entry.sha:
                 yield tree_path
 
 
 os_sep_bytes = os.sep.encode('ascii')
 
 
 def _tree_to_fs_path(root_path, tree_path):
     """Convert a git tree path to a file system path.
 
     Args:
       root_path: Root filesystem path
       tree_path: Git tree path as bytes
 
     Returns: File system path.
     """
     assert isinstance(tree_path, bytes)
     if os_sep_bytes != b'/':
         sep_corrected_path = tree_path.replace(b'/', os_sep_bytes)
     else:
         sep_corrected_path = tree_path
     return os.path.join(root_path, sep_corrected_path)
 
 
 def _fs_to_tree_path(fs_path, fs_encoding=None):
     """Convert a file system path to a git tree path.
 
     Args:
       fs_path: File system path.
       fs_encoding: File system encoding
 
     Returns:  Git tree path as bytes
     """
     if fs_encoding is None:
         fs_encoding = sys.getfilesystemencoding()
     if not isinstance(fs_path, bytes):
         fs_path_bytes = fs_path.encode(fs_encoding)
     else:
         fs_path_bytes = fs_path
     if os_sep_bytes != b'/':
         tree_path = fs_path_bytes.replace(os_sep_bytes, b'/')
     else:
         tree_path = fs_path_bytes
     return tree_path
 
 
 def index_entry_from_path(path, object_store=None):
     """Create an index from a filesystem path.
 
     This returns an index value for files, symlinks
     and tree references. for directories and
     non-existant files it returns None
 
     Args:
       path: Path to create an index entry for
       object_store: Optional object store to
         save new blobs in
     Returns: An index entry; None for directories
     """
     assert isinstance(path, bytes)
     st = os.lstat(path)
     if stat.S_ISDIR(st.st_mode):
         if os.path.exists(os.path.join(path, b'.git')):
             head = read_submodule_head(path)
             if head is None:
                 return None
             return index_entry_from_stat(
                 st, head, 0, mode=S_IFGITLINK)
         return None
 
     blob = blob_from_path_and_stat(path, st)
     if object_store is not None:
         object_store.add_object(blob)
     return index_entry_from_stat(st, blob.id, 0)
 
 
 def iter_fresh_entries(paths, root_path, object_store=None):
     """Iterate over current versions of index entries on disk.
 
     Args:
       paths: Paths to iterate over
       root_path: Root path to access from
       store: Optional store to save new blobs in
     Returns: Iterator over path, index_entry
     """
     for path in paths:
         p = _tree_to_fs_path(root_path, path)
         try:
             entry = index_entry_from_path(p, object_store=object_store)
         except EnvironmentError as e:
             if e.errno in (errno.ENOENT, errno.EISDIR):
                 entry = None
             else:
                 raise
         yield path, entry
 
 
 def iter_fresh_blobs(index, root_path):
     """Iterate over versions of blobs on disk referenced by index.
 
     Don't use this function; it removes missing entries from index.
 
     Args:
       index: Index file
       root_path: Root path to access from
       include_deleted: Include deleted entries with sha and
         mode set to None
     Returns: Iterator over path, sha, mode
     """
     import warnings
     warnings.warn(PendingDeprecationWarning,
                   "Use iter_fresh_objects instead.")
     for entry in iter_fresh_objects(
             index, root_path, include_deleted=True):
         if entry[1] is None:
             del index[entry[0]]
         else:
             yield entry
 
 
 def iter_fresh_objects(paths, root_path, include_deleted=False,
                        object_store=None):
     """Iterate over versions of objecs on disk referenced by index.
 
     Args:
       index: Index file
       root_path: Root path to access from
       include_deleted: Include deleted entries with sha and
         mode set to None
       object_store: Optional object store to report new items to
     Returns: Iterator over path, sha, mode
     """
     for path, entry in iter_fresh_entries(paths, root_path,
                                           object_store=object_store):
         if entry is None:
             if include_deleted:
                 yield path, None, None
         else:
             entry = IndexEntry(*entry)
             yield path, entry.sha, cleanup_mode(entry.mode)
 
 
 def refresh_index(index, root_path):
     """Refresh the contents of an index.
 
     This is the equivalent to running 'git commit -a'.
 
     Args:
       index: Index to update
       root_path: Root filesystem path
     """
     for path, entry in iter_fresh_entries(index, root_path):
         index[path] = path
diff --git a/dulwich/tests/test_index.py b/dulwich/tests/test_index.py
index fe0f9764..34bb8ccf 100644
--- a/dulwich/tests/test_index.py
+++ b/dulwich/tests/test_index.py
@@ -1,758 +1,762 @@
 # -*- coding: utf-8 -*-
 # test_index.py -- Tests for the git index
 # encoding: utf-8
 # Copyright (C) 2008-2009 Jelmer Vernooij <jelmer@jelmer.uk>
 #
 # Dulwich is dual-licensed under the Apache License, Version 2.0 and the GNU
 # General Public License as public by the Free Software Foundation; version 2.0
 # or (at your option) any later version. You can redistribute it and/or
 # modify it under the terms of either of these two licenses.
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
 # You should have received a copy of the licenses; if not, see
 # <http://www.gnu.org/licenses/> for a copy of the GNU General Public License
 # and <http://www.apache.org/licenses/LICENSE-2.0> for a copy of the Apache
 # License, Version 2.0.
 #
 
 """Tests for the index."""
 
 
 from io import BytesIO
 import os
 import shutil
 import stat
 import struct
 import sys
 import tempfile
 import warnings
 
 from dulwich.index import (
     Index,
     build_index_from_tree,
     cleanup_mode,
     commit_tree,
     get_unstaged_changes,
     index_entry_from_stat,
     read_index,
     read_index_dict,
     validate_path_element_default,
     validate_path_element_ntfs,
     write_cache_time,
     write_index,
     write_index_dict,
     _tree_to_fs_path,
     _fs_to_tree_path,
     )
 from dulwich.object_store import (
     MemoryObjectStore,
     )
 from dulwich.objects import (
     Blob,
     Commit,
     Tree,
     S_IFGITLINK,
     )
 from dulwich.repo import Repo
 from dulwich.tests import (
     TestCase,
     skipIf,
     )
 from dulwich.tests.utils import (
     setup_warning_catcher,
     )
 
 
 def can_symlink():
     """Return whether running process can create symlinks."""
     if sys.platform != 'win32':
         # Platforms other than Windows should allow symlinks without issues.
         return True
 
     if not hasattr(os, 'symlink'):
         # Older Python versions do not have `os.symlink` on Windows.
         return False
 
     test_source = tempfile.mkdtemp()
     test_target = test_source + 'can_symlink'
     try:
         os.symlink(test_source, test_target)
     except OSError:
         return False
     return True
 
 
 class IndexTestCase(TestCase):
 
     datadir = os.path.join(os.path.dirname(__file__), 'data/indexes')
 
     def get_simple_index(self, name):
         return Index(os.path.join(self.datadir, name))
 
 
 class SimpleIndexTestCase(IndexTestCase):
 
     def test_len(self):
         self.assertEqual(1, len(self.get_simple_index("index")))
 
     def test_iter(self):
         self.assertEqual([b'bla'], list(self.get_simple_index("index")))
 
     def test_iterobjects(self):
         self.assertEqual(
                 [(b'bla', b'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 33188)],
                 list(self.get_simple_index("index").iterobjects()))
 
     def test_iterblobs(self):
         warnings.simplefilter("always", UserWarning)
         self.addCleanup(warnings.resetwarnings)
         warnings_list, restore_warnings = setup_warning_catcher()
         self.addCleanup(restore_warnings)
 
         self.assertEqual(
                 [(b'bla', b'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 33188)],
                 list(self.get_simple_index("index").iterblobs()))
 
         expected_warning = PendingDeprecationWarning(
             'Use iterobjects() instead.')
         for w in warnings_list:
             if (type(w) == type(expected_warning) and
                     w.args == expected_warning.args):
                 break
         else:
             raise AssertionError(
                 'Expected warning %r not in %r' %
                 (expected_warning, warnings_list))
 
     def test_getitem(self):
         self.assertEqual(
                 ((1230680220, 0), (1230680220, 0), 2050, 3761020,
                  33188, 1000, 1000, 0,
                  b'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 0),
                 self.get_simple_index("index")[b"bla"])
 
     def test_empty(self):
         i = self.get_simple_index("notanindex")
         self.assertEqual(0, len(i))
         self.assertFalse(os.path.exists(i._filename))
 
     def test_against_empty_tree(self):
         i = self.get_simple_index("index")
         changes = list(i.changes_from_tree(MemoryObjectStore(), None))
         self.assertEqual(1, len(changes))
         (oldname, newname), (oldmode, newmode), (oldsha, newsha) = changes[0]
         self.assertEqual(b'bla', newname)
         self.assertEqual(b'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', newsha)
 
 
 class SimpleIndexWriterTestCase(IndexTestCase):
 
     def setUp(self):
         IndexTestCase.setUp(self)
         self.tempdir = tempfile.mkdtemp()
 
     def tearDown(self):
         IndexTestCase.tearDown(self)
         shutil.rmtree(self.tempdir)
 
     def test_simple_write(self):
         entries = [(b'barbla', (1230680220, 0), (1230680220, 0), 2050, 3761020,
                     33188, 1000, 1000, 0,
                     b'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 0)]
         filename = os.path.join(self.tempdir, 'test-simple-write-index')
         with open(filename, 'wb+') as x:
             write_index(x, entries)
 
         with open(filename, 'rb') as x:
             self.assertEqual(entries, list(read_index(x)))
 
 
 class ReadIndexDictTests(IndexTestCase):
 
     def setUp(self):
         IndexTestCase.setUp(self)
         self.tempdir = tempfile.mkdtemp()
 
     def tearDown(self):
         IndexTestCase.tearDown(self)
         shutil.rmtree(self.tempdir)
 
     def test_simple_write(self):
         entries = {
                 b'barbla':
                 ((1230680220, 0), (1230680220, 0), 2050, 3761020, 33188,
                  1000, 1000, 0,
                  b'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 0)}
         filename = os.path.join(self.tempdir, 'test-simple-write-index')
         with open(filename, 'wb+') as x:
             write_index_dict(x, entries)
 
         with open(filename, 'rb') as x:
             self.assertEqual(entries, read_index_dict(x))
 
 
 class CommitTreeTests(TestCase):
 
     def setUp(self):
         super(CommitTreeTests, self).setUp()
         self.store = MemoryObjectStore()
 
     def test_single_blob(self):
         blob = Blob()
         blob.data = b"foo"
         self.store.add_object(blob)
         blobs = [(b"bla", blob.id, stat.S_IFREG)]
         rootid = commit_tree(self.store, blobs)
         self.assertEqual(rootid, b"1a1e80437220f9312e855c37ac4398b68e5c1d50")
         self.assertEqual((stat.S_IFREG, blob.id), self.store[rootid][b"bla"])
         self.assertEqual(set([rootid, blob.id]), set(self.store._data.keys()))
 
     def test_nested(self):
         blob = Blob()
         blob.data = b"foo"
         self.store.add_object(blob)
         blobs = [(b"bla/bar", blob.id, stat.S_IFREG)]
         rootid = commit_tree(self.store, blobs)
         self.assertEqual(rootid, b"d92b959b216ad0d044671981196781b3258fa537")
         dirid = self.store[rootid][b"bla"][1]
         self.assertEqual(dirid, b"c1a1deb9788150829579a8b4efa6311e7b638650")
         self.assertEqual((stat.S_IFDIR, dirid), self.store[rootid][b"bla"])
         self.assertEqual((stat.S_IFREG, blob.id), self.store[dirid][b"bar"])
         self.assertEqual(set([rootid, dirid, blob.id]),
                          set(self.store._data.keys()))
 
 
 class CleanupModeTests(TestCase):
 
+    def assertModeEqual(self, expected, got):
+        self.assertEqual(expected, got, '%o != %o' % (expected, got))
+
     def test_file(self):
-        self.assertEqual(0o100644, cleanup_mode(0o100000))
+        self.assertModeEqual(0o100644, cleanup_mode(0o100000))
 
     def test_executable(self):
-        self.assertEqual(0o100755, cleanup_mode(0o100711))
+        self.assertModeEqual(0o100755, cleanup_mode(0o100711))
+        self.assertModeEqual(0o100755, cleanup_mode(0o100700))
 
     def test_symlink(self):
-        self.assertEqual(0o120000, cleanup_mode(0o120711))
+        self.assertModeEqual(0o120000, cleanup_mode(0o120711))
 
     def test_dir(self):
-        self.assertEqual(0o040000, cleanup_mode(0o40531))
+        self.assertModeEqual(0o040000, cleanup_mode(0o40531))
 
     def test_submodule(self):
-        self.assertEqual(0o160000, cleanup_mode(0o160744))
+        self.assertModeEqual(0o160000, cleanup_mode(0o160744))
 
 
 class WriteCacheTimeTests(TestCase):
 
     def test_write_string(self):
         f = BytesIO()
         self.assertRaises(TypeError, write_cache_time, f, "foo")
 
     def test_write_int(self):
         f = BytesIO()
         write_cache_time(f, 434343)
         self.assertEqual(struct.pack(">LL", 434343, 0), f.getvalue())
 
     def test_write_tuple(self):
         f = BytesIO()
         write_cache_time(f, (434343, 21))
         self.assertEqual(struct.pack(">LL", 434343, 21), f.getvalue())
 
     def test_write_float(self):
         f = BytesIO()
         write_cache_time(f, 434343.000000021)
         self.assertEqual(struct.pack(">LL", 434343, 21), f.getvalue())
 
 
 class IndexEntryFromStatTests(TestCase):
 
     def test_simple(self):
         st = os.stat_result(
                 (16877, 131078, 64769, 154, 1000, 1000, 12288,
                  1323629595, 1324180496, 1324180496))
         entry = index_entry_from_stat(st, "22" * 20, 0)
         self.assertEqual(entry, (
             1324180496,
             1324180496,
             64769,
             131078,
             16384,
             1000,
             1000,
             12288,
             '2222222222222222222222222222222222222222',
             0))
 
     def test_override_mode(self):
         st = os.stat_result(
                 (stat.S_IFREG + 0o644, 131078, 64769,
                  154, 1000, 1000, 12288,
                  1323629595, 1324180496, 1324180496))
         entry = index_entry_from_stat(
             st, "22" * 20, 0, mode=stat.S_IFREG + 0o755)
         self.assertEqual(entry, (
             1324180496,
             1324180496,
             64769,
             131078,
             33261,
             1000,
             1000,
             12288,
             '2222222222222222222222222222222222222222',
             0))
 
 
 class BuildIndexTests(TestCase):
 
     def assertReasonableIndexEntry(self, index_entry, mode, filesize, sha):
         self.assertEqual(index_entry[4], mode)  # mode
         self.assertEqual(index_entry[7], filesize)  # filesize
         self.assertEqual(index_entry[8], sha)  # sha
 
     def assertFileContents(self, path, contents, symlink=False):
         if symlink:
             self.assertEqual(os.readlink(path), contents)
         else:
             with open(path, 'rb') as f:
                 self.assertEqual(f.read(), contents)
 
     def test_empty(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
             tree = Tree()
             repo.object_store.add_object(tree)
 
             build_index_from_tree(
                     repo.path, repo.index_path(),
                     repo.object_store, tree.id)
 
             # Verify index entries
             index = repo.open_index()
             self.assertEqual(len(index), 0)
 
             # Verify no files
             self.assertEqual(['.git'], os.listdir(repo.path))
 
     def test_git_dir(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
 
             # Populate repo
             filea = Blob.from_string(b'file a')
             filee = Blob.from_string(b'd')
 
             tree = Tree()
             tree[b'.git/a'] = (stat.S_IFREG | 0o644, filea.id)
             tree[b'c/e'] = (stat.S_IFREG | 0o644, filee.id)
 
             repo.object_store.add_objects(
                     [(o, None) for o in [filea, filee, tree]])
 
             build_index_from_tree(
                 repo.path, repo.index_path(), repo.object_store, tree.id)
 
             # Verify index entries
             index = repo.open_index()
             self.assertEqual(len(index), 1)
 
             # filea
             apath = os.path.join(repo.path, '.git', 'a')
             self.assertFalse(os.path.exists(apath))
 
             # filee
             epath = os.path.join(repo.path, 'c', 'e')
             self.assertTrue(os.path.exists(epath))
             self.assertReasonableIndexEntry(
                 index[b'c/e'], stat.S_IFREG | 0o644, 1, filee.id)
             self.assertFileContents(epath, b'd')
 
     def test_nonempty(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
 
             # Populate repo
             filea = Blob.from_string(b'file a')
             fileb = Blob.from_string(b'file b')
             filed = Blob.from_string(b'file d')
 
             tree = Tree()
             tree[b'a'] = (stat.S_IFREG | 0o644, filea.id)
             tree[b'b'] = (stat.S_IFREG | 0o644, fileb.id)
             tree[b'c/d'] = (stat.S_IFREG | 0o644, filed.id)
 
             repo.object_store.add_objects(
                 [(o, None) for o in [filea, fileb, filed, tree]])
 
             build_index_from_tree(
                 repo.path, repo.index_path(), repo.object_store, tree.id)
 
             # Verify index entries
             index = repo.open_index()
             self.assertEqual(len(index), 3)
 
             # filea
             apath = os.path.join(repo.path, 'a')
             self.assertTrue(os.path.exists(apath))
             self.assertReasonableIndexEntry(
                     index[b'a'], stat.S_IFREG | 0o644, 6, filea.id)
             self.assertFileContents(apath, b'file a')
 
             # fileb
             bpath = os.path.join(repo.path, 'b')
             self.assertTrue(os.path.exists(bpath))
             self.assertReasonableIndexEntry(
                     index[b'b'], stat.S_IFREG | 0o644, 6, fileb.id)
             self.assertFileContents(bpath, b'file b')
 
             # filed
             dpath = os.path.join(repo.path, 'c', 'd')
             self.assertTrue(os.path.exists(dpath))
             self.assertReasonableIndexEntry(
                     index[b'c/d'], stat.S_IFREG | 0o644, 6, filed.id)
             self.assertFileContents(dpath, b'file d')
 
             # Verify no extra files
             self.assertEqual(
                     ['.git', 'a', 'b', 'c'], sorted(os.listdir(repo.path)))
             self.assertEqual(
                     ['d'], sorted(os.listdir(os.path.join(repo.path, 'c'))))
 
     @skipIf(not getattr(os, 'sync', None), 'Requires sync support')
     def test_norewrite(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
             # Populate repo
             filea = Blob.from_string(b'file a')
             filea_path = os.path.join(repo_dir, 'a')
             tree = Tree()
             tree[b'a'] = (stat.S_IFREG | 0o644, filea.id)
 
             repo.object_store.add_objects([(o, None) for o in [filea, tree]])
 
             # First Write
             build_index_from_tree(repo.path, repo.index_path(),
                                   repo.object_store, tree.id)
             # Use sync as metadata can be cached on some FS
             os.sync()
             mtime = os.stat(filea_path).st_mtime
 
             # Test Rewrite
             build_index_from_tree(repo.path, repo.index_path(),
                                   repo.object_store, tree.id)
             os.sync()
             self.assertEqual(mtime, os.stat(filea_path).st_mtime)
 
             # Modify content
             with open(filea_path, 'wb') as fh:
                 fh.write(b'test a')
             os.sync()
             mtime = os.stat(filea_path).st_mtime
 
             # Test rewrite
             build_index_from_tree(repo.path, repo.index_path(),
                                   repo.object_store, tree.id)
             os.sync()
             with open(filea_path, 'rb') as fh:
                 self.assertEqual(b'file a', fh.read())
 
     @skipIf(not can_symlink(), 'Requires symlink support')
     def test_symlink(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
 
             # Populate repo
             filed = Blob.from_string(b'file d')
             filee = Blob.from_string(b'd')
 
             tree = Tree()
             tree[b'c/d'] = (stat.S_IFREG | 0o644, filed.id)
             tree[b'c/e'] = (stat.S_IFLNK, filee.id)  # symlink
 
             repo.object_store.add_objects(
                     [(o, None) for o in [filed, filee, tree]])
 
             build_index_from_tree(
                     repo.path, repo.index_path(), repo.object_store, tree.id)
 
             # Verify index entries
             index = repo.open_index()
 
             # symlink to d
             epath = os.path.join(repo.path, 'c', 'e')
             self.assertTrue(os.path.exists(epath))
             self.assertReasonableIndexEntry(
                 index[b'c/e'], stat.S_IFLNK,
                 0 if sys.platform == 'win32' else 1,
                 filee.id)
             self.assertFileContents(epath, 'd', symlink=True)
 
     def test_no_decode_encode(self):
         repo_dir = tempfile.mkdtemp()
         repo_dir_bytes = repo_dir.encode(sys.getfilesystemencoding())
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
 
             # Populate repo
             file = Blob.from_string(b'foo')
 
             tree = Tree()
             latin1_name = u'À'.encode('latin1')
             latin1_path = os.path.join(repo_dir_bytes, latin1_name)
             utf8_name = u'À'.encode('utf8')
             utf8_path = os.path.join(repo_dir_bytes, utf8_name)
             tree[latin1_name] = (stat.S_IFREG | 0o644, file.id)
             tree[utf8_name] = (stat.S_IFREG | 0o644, file.id)
 
             repo.object_store.add_objects(
                 [(o, None) for o in [file, tree]])
 
             try:
                 os.path.exists(latin1_path)
             except UnicodeDecodeError:
                 # This happens e.g. with python3.6 on Windows.
                 # It implicitly decodes using utf8, which doesn't work.
                 self.skipTest('can not implicitly convert as utf8')
 
             build_index_from_tree(
                 repo.path, repo.index_path(),
                 repo.object_store, tree.id)
 
             # Verify index entries
             index = repo.open_index()
             self.assertIn(latin1_name, index)
             self.assertIn(utf8_name, index)
 
             self.assertTrue(os.path.exists(latin1_path))
 
             self.assertTrue(os.path.exists(utf8_path))
 
     def test_git_submodule(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
             filea = Blob.from_string(b'file alalala')
 
             subtree = Tree()
             subtree[b'a'] = (stat.S_IFREG | 0o644, filea.id)
 
             c = Commit()
             c.tree = subtree.id
             c.committer = c.author = b'Somebody <somebody@example.com>'
             c.commit_time = c.author_time = 42342
             c.commit_timezone = c.author_timezone = 0
             c.parents = []
             c.message = b'Subcommit'
 
             tree = Tree()
             tree[b'c'] = (S_IFGITLINK, c.id)
 
             repo.object_store.add_objects(
                 [(o, None) for o in [tree]])
 
             build_index_from_tree(
                     repo.path, repo.index_path(), repo.object_store, tree.id)
 
             # Verify index entries
             index = repo.open_index()
             self.assertEqual(len(index), 1)
 
             # filea
             apath = os.path.join(repo.path, 'c/a')
             self.assertFalse(os.path.exists(apath))
 
             # dir c
             cpath = os.path.join(repo.path, 'c')
             self.assertTrue(os.path.isdir(cpath))
             self.assertEqual(index[b'c'][4], S_IFGITLINK)  # mode
             self.assertEqual(index[b'c'][8], c.id)  # sha
 
     def test_git_submodule_exists(self):
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
             filea = Blob.from_string(b'file alalala')
 
             subtree = Tree()
             subtree[b'a'] = (stat.S_IFREG | 0o644, filea.id)
 
             c = Commit()
             c.tree = subtree.id
             c.committer = c.author = b'Somebody <somebody@example.com>'
             c.commit_time = c.author_time = 42342
             c.commit_timezone = c.author_timezone = 0
             c.parents = []
             c.message = b'Subcommit'
 
             tree = Tree()
             tree[b'c'] = (S_IFGITLINK, c.id)
 
             os.mkdir(os.path.join(repo_dir, 'c'))
             repo.object_store.add_objects(
                 [(o, None) for o in [tree]])
 
             build_index_from_tree(
                     repo.path, repo.index_path(), repo.object_store, tree.id)
 
             # Verify index entries
             index = repo.open_index()
             self.assertEqual(len(index), 1)
 
             # filea
             apath = os.path.join(repo.path, 'c/a')
             self.assertFalse(os.path.exists(apath))
 
             # dir c
             cpath = os.path.join(repo.path, 'c')
             self.assertTrue(os.path.isdir(cpath))
             self.assertEqual(index[b'c'][4], S_IFGITLINK)  # mode
             self.assertEqual(index[b'c'][8], c.id)  # sha
 
 
 class GetUnstagedChangesTests(TestCase):
 
     def test_get_unstaged_changes(self):
         """Unit test for get_unstaged_changes."""
 
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
 
             # Commit a dummy file then modify it
             foo1_fullpath = os.path.join(repo_dir, 'foo1')
             with open(foo1_fullpath, 'wb') as f:
                 f.write(b'origstuff')
 
             foo2_fullpath = os.path.join(repo_dir, 'foo2')
             with open(foo2_fullpath, 'wb') as f:
                 f.write(b'origstuff')
 
             repo.stage(['foo1', 'foo2'])
             repo.do_commit(b'test status', author=b'author <email>',
                            committer=b'committer <email>')
 
             with open(foo1_fullpath, 'wb') as f:
                 f.write(b'newstuff')
 
             # modify access and modify time of path
             os.utime(foo1_fullpath, (0, 0))
 
             changes = get_unstaged_changes(repo.open_index(), repo_dir)
 
             self.assertEqual(list(changes), [b'foo1'])
 
     def test_get_unstaged_deleted_changes(self):
         """Unit test for get_unstaged_changes."""
 
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
 
             # Commit a dummy file then remove it
             foo1_fullpath = os.path.join(repo_dir, 'foo1')
             with open(foo1_fullpath, 'wb') as f:
                 f.write(b'origstuff')
 
             repo.stage(['foo1'])
             repo.do_commit(b'test status', author=b'author <email>',
                            committer=b'committer <email>')
 
             os.unlink(foo1_fullpath)
 
             changes = get_unstaged_changes(repo.open_index(), repo_dir)
 
             self.assertEqual(list(changes), [b'foo1'])
 
     def test_get_unstaged_changes_removed_replaced_by_directory(self):
         """Unit test for get_unstaged_changes."""
 
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
 
             # Commit a dummy file then modify it
             foo1_fullpath = os.path.join(repo_dir, 'foo1')
             with open(foo1_fullpath, 'wb') as f:
                 f.write(b'origstuff')
 
             repo.stage(['foo1'])
             repo.do_commit(b'test status', author=b'author <email>',
                            committer=b'committer <email>')
 
             os.remove(foo1_fullpath)
             os.mkdir(foo1_fullpath)
 
             changes = get_unstaged_changes(repo.open_index(), repo_dir)
 
             self.assertEqual(list(changes), [b'foo1'])
 
     @skipIf(not can_symlink(), 'Requires symlink support')
     def test_get_unstaged_changes_removed_replaced_by_link(self):
         """Unit test for get_unstaged_changes."""
 
         repo_dir = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, repo_dir)
         with Repo.init(repo_dir) as repo:
 
             # Commit a dummy file then modify it
             foo1_fullpath = os.path.join(repo_dir, 'foo1')
             with open(foo1_fullpath, 'wb') as f:
                 f.write(b'origstuff')
 
             repo.stage(['foo1'])
             repo.do_commit(b'test status', author=b'author <email>',
                            committer=b'committer <email>')
 
             os.remove(foo1_fullpath)
             os.symlink(os.path.dirname(foo1_fullpath), foo1_fullpath)
 
             changes = get_unstaged_changes(repo.open_index(), repo_dir)
 
             self.assertEqual(list(changes), [b'foo1'])
 
 
 class TestValidatePathElement(TestCase):
 
     def test_default(self):
         self.assertTrue(validate_path_element_default(b"bla"))
         self.assertTrue(validate_path_element_default(b".bla"))
         self.assertFalse(validate_path_element_default(b".git"))
         self.assertFalse(validate_path_element_default(b".giT"))
         self.assertFalse(validate_path_element_default(b".."))
         self.assertTrue(validate_path_element_default(b"git~1"))
 
     def test_ntfs(self):
         self.assertTrue(validate_path_element_ntfs(b"bla"))
         self.assertTrue(validate_path_element_ntfs(b".bla"))
         self.assertFalse(validate_path_element_ntfs(b".git"))
         self.assertFalse(validate_path_element_ntfs(b".giT"))
         self.assertFalse(validate_path_element_ntfs(b".."))
         self.assertFalse(validate_path_element_ntfs(b"git~1"))
 
 
 class TestTreeFSPathConversion(TestCase):
 
     def test_tree_to_fs_path(self):
         tree_path = u'délwíçh/foo'.encode('utf8')
         fs_path = _tree_to_fs_path(b'/prefix/path', tree_path)
         self.assertEqual(
             fs_path,
             os.path.join(u'/prefix/path', u'délwíçh', u'foo').encode('utf8'))
 
     def test_fs_to_tree_path_str(self):
         fs_path = os.path.join(os.path.join(u'délwíçh', u'foo'))
         tree_path = _fs_to_tree_path(fs_path, "utf-8")
         self.assertEqual(tree_path, u'délwíçh/foo'.encode("utf-8"))
 
     def test_fs_to_tree_path_bytes(self):
         fs_path = os.path.join(os.path.join(u'délwíçh', u'foo').encode('utf8'))
         tree_path = _fs_to_tree_path(fs_path, "utf-8")
         self.assertEqual(tree_path, u'délwíçh/foo'.encode('utf8'))