From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Nov 2014 20:12:50 +0000 (-0800)
Subject: Update draft release notes to 2.2
X-Git-Tag: v2.2.0-rc2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5709437d963e585df0691989d3ccfee1de1572b;p=git

Update draft release notes to 2.2

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

diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index a5c3381b69..d4001c5ae5 100644
--- a/Documentation/RelNotes/2.2.0.txt
+++ b/Documentation/RelNotes/2.2.0.txt
@@ -295,3 +295,17 @@ notes for details).
    object reachability bitmap when it needs to split the resulting
    pack.
    (merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint).
+
+ * The code to use cache-tree trusted the on-disk data too much and
+   fell into an infinite loop upon seeing an incorrectly recorded
+   index file.
+   (merge 729dbbd jk/cache-tree-protect-from-broken-libgit2 later to maint).
+
+ * "git fetch" into a repository where branch B was deleted earlier
+   back when it had reflog enabled, and then branch B/C is fetched
+   into it without reflog enabled, which is arguably an unlikely
+   corner case, unnecessarily failed.
+   (merge aae828b jk/fetch-reflog-df-conflict later to maint).
+
+ * "git log --first-parent -L..." used to crash.
+   (merge a8787c5 tm/line-log-first-parent later to maint).