From be6ff8196d9890c1875a75b96320b863dd1fe815 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 17 Dec 2009 22:23:54 -0800 Subject: [PATCH] builtin-merge.c: use standard active_cache macros Instead of using the low-level index_state interface, use the bog standard active_cache and active_nr macros to access the cache entries when using the default one. Signed-off-by: Junio C Hamano --- builtin-merge.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/builtin-merge.c b/builtin-merge.c index f1c84d759..6cb804b6c 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -618,11 +618,10 @@ static void count_diff_files(struct diff_queue_struct *q, static int count_unmerged_entries(void) { - const struct index_state *state = &the_index; int i, ret = 0; - for (i = 0; i < state->cache_nr; i++) - if (ce_stage(state->cache[i])) + for (i = 0; i < active_nr; i++) + if (ce_stage(active_cache[i])) ret++; return ret; -- 2.26.2