summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-11-12 20:12:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-12 20:13:39 (GMT)
commitf5709437d963e585df0691989d3ccfee1de1572b (patch)
tree2bad07f519b6131c3fe94e09c6662d728188f87b
parent9c70e2c105f9c4b4708af6ae25d2678929b3d61d (diff)
downloadgit-f5709437d963e585df0691989d3ccfee1de1572b.zip
git-f5709437d963e585df0691989d3ccfee1de1572b.tar.gz
git-f5709437d963e585df0691989d3ccfee1de1572b.tar.bz2
Update draft release notes to 2.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.2.0.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt
index a5c3381..d4001c5 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).