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>
Nguyễn Thái Ngọc Duy committed
Jun 13, 2014 at 19:19 UTC
5a092ceb6b285e8377add13d460850668fd0d13c
1 file changed
+9
builtin/read-tree.c
+9
@@ -155,6 +155,15 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
155
if (1 < opts.merge + opts.reset + prefix_set)
156
die("Which one? -m, --reset, or --prefix?");
157
158
+ /*
159
+ * NEEDSWORK
160
+ *
161
+ * The old index should be read anyway even if we're going to
162
+ * destroy all index entries because we still need to preserve
163
+ * certain information such as index version or split-index
164
+ * mode.
165
+ */
166
+
167
if (opts.reset || opts.merge || opts.prefix) {
168
if (read_cache_unmerged() && (opts.prefix || opts.merge))
169
die("You need to resolve your current index first");