diff --git a/read-cache.c b/read-cache.c
index fee0c80734db2d5106c4c6fd6bc396af1831c392..657f0c5894c65831b80ceee54d161d0beac1d733 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
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;