Getting ready for -rc1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt
index ba19a3bcf1a32180f6f8e78114b2c140a59ffc1d..b757fd119c04a6d9b2fc6414ea3e39042ea4e033 100644 (file)
--- a/Documentation/RelNotes/2.13.0.txt
+++ b/Documentation/RelNotes/2.13.0.txt
@@ -182,6 +182,10 @@ UI, Workflows & Features
    to the working tree of the submodule but not the commit that is
    checked out.
 
    to the working tree of the submodule but not the commit that is
    checked out.
 

+ * Allow the http.postbuffer configuration variable to be set to a
+   size that can be expressed in size_t, which can be larger than
+   ulong on some platforms.
+

 
 Performance, Internal Implementation, Development Support etc.
 
 
 Performance, Internal Implementation, Development Support etc.
 


@@ -242,8 +246,6 @@ Performance, Internal Implementation, Development Support etc.
    older one and the newer one interoperate happily has now become
    possible.
 
    older one and the newer one interoperate happily has now become
    possible.
 

- * "uchar [40]" to "struct object_id" conversion continues.
-

  * "git tag --contains" used to (ab)use the object bits to keep track
    of the state of object reachability without clearing them after
    use; this has been cleaned up and made to use the newer commit-slab
  * "git tag --contains" used to (ab)use the object bits to keep track
    of the state of object reachability without clearing them after
    use; this has been cleaned up and made to use the newer commit-slab


@@ -278,13 +280,28 @@ Performance, Internal Implementation, Development Support etc.
  * Define a new task in .travis.yml that triggers a test session on
    Windows run elsewhere.
 
  * Define a new task in .travis.yml that triggers a test session on
    Windows run elsewhere.
 

- * Conversion from unsigned char [40] to struct object_id continues.
+ * Conversion from uchar[20] to struct object_id continues.

 
  * The "submodule" specific field in the ref_store structure is
    replaced with a more generic "gitdir" that can later be used also
    when dealing with ref_store that represents the set of refs visible
    from the other worktrees.
 
 
  * The "submodule" specific field in the ref_store structure is
    replaced with a more generic "gitdir" that can later be used also
    when dealing with ref_store that represents the set of refs visible
    from the other worktrees.
 

+ * The string-list API used a custom reallocation strategy that was
+   very inefficient, instead of using the usual ALLOC_GROW() macro,
+   which has been fixed.
+   (merge 950a234cbd jh/string-list-micro-optim later to maint).
+
+ * In a 2- and 3-way merge of trees, more than one source trees often
+   end up sharing an identical subtree; optimize by not reading the
+   same tree multiple times in such a case.
+   (merge d12a8cf0af jh/unpack-trees-micro-optim later to maint).
+
+ * The index file has a trailing SHA-1 checksum to detect file
+   corruption, and historically we checked it every time the index
+   file is used.  Omit the validation during normal use, and instead
+   verify only in "git fsck".
+

 Also contains various documentation updates and code clean-ups.
 
 
 Also contains various documentation updates and code clean-ups.
 
 


@@ -492,6 +509,32 @@ notes for details).
    checked out; it should use "symbolic-ref HEAD".
    (merge eff451101d ld/p4-current-branch-fix later to maint).
 
    checked out; it should use "symbolic-ref HEAD".
    (merge eff451101d ld/p4-current-branch-fix later to maint).
 

+ * "http.proxy" set to an empty string is used to disable the usage of
+   proxy.  We broke this early last year.
+   (merge ae51d91105 sr/http-proxy-configuration-fix later to maint).
+
+ * $GIT_DIR may in some cases be normalized with all symlinks resolved
+   while "gitdir" path expansion in the pattern does not receive the
+   same treatment, leading to incorrect mismatch.  This has been fixed.
+
+ * "git submodule" script does not work well with strange pathnames.
+   Protect it from a path with slashes in them, at least.
+
+ * "git fetch-pack" was not prepared to accept ERR packet that the
+   upload-pack can send with a human-readable error message.  It
+   showed the packet contents with ERR prefix, so there was no data
+   loss, but it was redundant to say "ERR" in an error message.
+   (merge 8e2c7bef03 jt/fetch-pack-error-reporting later to maint).
+
+ * "ls-files --recurse-submodules" did not quite work well in a
+   project with nested submodules.
+
+ * gethostname(2) may not NUL terminate the buffer if hostname does
+   not fit; unfortunately there is no easy way to see if our buffer
+   was too small, but at least this will make sure we will not end up
+   using garbage past the end of the buffer.
+   (merge 5781a9a270 dt/xgethostname-nul-termination later to maint).
+

  * Other minor doc, test and build updates and code cleanups.
    (merge df2a6e38b7 jk/pager-in-use later to maint).
    (merge 75ec4a6cb0 ab/branch-list-doc later to maint).
  * Other minor doc, test and build updates and code cleanups.
    (merge df2a6e38b7 jk/pager-in-use later to maint).
    (merge 75ec4a6cb0 ab/branch-list-doc later to maint).


@@ -509,3 +552,8 @@ notes for details).
    (merge 35ad44cbd8 sb/submodule-rm-absorb later to maint).
    (merge 0301f1fd92 va/i18n-perl-scripts later to maint).
    (merge 733e064d98 vn/revision-shorthand-for-side-branch-log later to maint).
    (merge 35ad44cbd8 sb/submodule-rm-absorb later to maint).
    (merge 0301f1fd92 va/i18n-perl-scripts later to maint).
    (merge 733e064d98 vn/revision-shorthand-for-side-branch-log later to maint).

+   (merge 85999743e7 tb/doc-eol-normalization later to maint).
+   (merge 0747fb49fd jk/loose-object-fsck later to maint).
+   (merge d8f4481c4f jk/quarantine-received-objects later to maint).
+   (merge 7ba1ceef95 xy/format-patch-base later to maint).
+   (merge fa1912c89a rs/misc-cppcheck-fixes later to maint).