From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Fri, 13 Jun 2014 12:19:47 +0000 (+0700)
Subject: read-tree: force split-index mode off on --index-output
X-Git-Tag: v2.1.0-rc0~45^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5165dd598a402b25301ea41fa5e0d9a72ad78393?ds=sidebyside

read-tree: force split-index mode off on --index-output

Just a (paranoid?) safety measure..

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/read-cache.c b/read-cache.c
index aa848e170f..b1027f7ee0 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2070,7 +2070,8 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock,
 {
 	struct split_index *si = istate->split_index;
 
-	if (!si || (istate->cache_changed & ~EXTMASK)) {
+	if (!si || alternate_index_output ||
+	    (istate->cache_changed & ~EXTMASK)) {
 		if (si)
 			hashclr(si->base_sha1);
 		return do_write_locked_index(istate, lock, flags);