Merge branch 'maint'

* maint:
  rev-parse: clarify documentation of $name@{upstream} syntax
  sha1_name: pass object name length to diagnose_invalid_sha1_path()
  Makefile: keep LIB_H entries together and sorted

diff --cc Documentation/revisions.txt
Simple merge

diff --cc Makefile
index 26d3332,5be5458..598d631
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -734,8 -683,13 +718,14 @@@ LIB_H += url.
  LIB_H += userdiff.h
  LIB_H += utf8.h
  LIB_H += varint.h
+ LIB_H += vcs-svn/fast_export.h
+ LIB_H += vcs-svn/line_buffer.h
+ LIB_H += vcs-svn/repo_tree.h
+ LIB_H += vcs-svn/sliding_window.h
+ LIB_H += vcs-svn/svndiff.h
+ LIB_H += vcs-svn/svndump.h
  LIB_H += walker.h
 +LIB_H += wildmatch.h
  LIB_H += wt-status.h
  LIB_H += xdiff-interface.h
  LIB_H += xdiff/xdiff.h