From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Fri, 13 Jun 2014 12:19:48 +0000 (+0700)
Subject: read-tree: note about dropping split-index mode or index version
X-Git-Tag: v2.1.0-rc0~45^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a092ceb6b285e8377add13d460850668fd0d13c;p=thirdparty%2Fgit.git

read-tree: note about dropping split-index mode or index version

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 3204c62eaf..e7e1c33a7f 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -155,6 +155,15 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 	if (1 < opts.merge + opts.reset + prefix_set)
 		die("Which one? -m, --reset, or --prefix?");
 
+	/*
+	 * NEEDSWORK
+	 *
+	 * The old index should be read anyway even if we're going to
+	 * destroy all index entries because we still need to preserve
+	 * certain information such as index version or split-index
+	 * mode.
+	 */
+
 	if (opts.reset || opts.merge || opts.prefix) {
 		if (read_cache_unmerged() && (opts.prefix || opts.merge))
 			die("You need to resolve your current index first");