From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Mar 2013 07:11:11 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.2.1~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb79a827a2bd4987b6def75a534635d75478cf4d;p=thirdparty%2Fgit.git

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
---

bb79a827a2bd4987b6def75a534635d75478cf4d
diff --cc Makefile
index 26d3332755,5be54584b7..598d6313da
--- a/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