Merge branch 'as/subtree-with-spaces' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:14:11 +0000 (11:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Dec 2015 19:14:11 +0000 (11:14 -0800)
commit8c0a546670a2cb2349c5baedbf4b87268e52c665
tree4e06876cef5346fd73a8428770ba8b0d29e0b44b
parent4cb5488fa6cd1dc3cea253e7d8df6bf9d945653b
parent5b6ab38bd31790d072aabbc23fe936ba5e1b072a
Merge branch 'as/subtree-with-spaces' into maint

Update "git subtree" (in contrib/) so that it can take whitespaces
in the pathnames, not only in the in-tree pathname but the name of
the directory that the repository is in.

* as/subtree-with-spaces:
  contrib/subtree: respect spaces in a repository path
  t7900-subtree: test the "space in a subdirectory name" case