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

pclouds · gitster · commit 5165dd598a40 · 2014-06-13T11:49:41.000-07:00
Just a (paranoid?) safety measure..

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -2070,7 +2070,8 @@ int write_locked_index(struct index_state istate, struct lock_file lock,`
`2070`	`2070`	`{`
`2071`	`2071`	`struct split_index *si = istate->split_index;`
`2072`	`2072`
`2073`		`- if (!si \|\| (istate->cache_changed & ~EXTMASK)) {`
	`2073`	`+ if (!si \|\| alternate_index_output \|\|`
	`2074`	`+ (istate->cache_changed & ~EXTMASK)) {`
`2074`	`2075`	`if (si)`
`2075`	`2076`	`hashclr(si->base_sha1);`
`2076`	`2077`	`return do_write_locked_index(istate, lock, flags);`