X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=read-cache.c;h=657f0c5894c65831b80ceee54d161d0beac1d733;hb=9225d7be0abab0c3b1325a733aea127b45a18625;hp=fee0c80734db2d5106c4c6fd6bc396af1831c392;hpb=e38f892d1832977511c4e7c82204c7f94c3a3232;p=git.git

diff --git a/read-cache.c b/read-cache.c
index fee0c8073..657f0c589 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1166,6 +1166,16 @@ int discard_index(struct index_state *istate)
 	return 0;
 }
 
+int unmerged_index(struct index_state *istate)
+{
+	int i;
+	for (i = 0; i < istate->cache_nr; i++) {
+		if (ce_stage(istate->cache[i]))
+			return 1;
+	}
+	return 0;
+}
+
 #define WRITE_BUFFER_SIZE 8192
 static unsigned char write_buffer[WRITE_BUFFER_SIZE];
 static unsigned long write_buffer_len;