[PATCH 1/9] builtin-merge.c: use standard active_cache macros

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 29, 2009, 21:42 UTC
Message-ID: <1262122958-9378-2-git-send-email-gitster@pobox.com>
In-Reply-To: <1262122958-9378-1-git-send-email-gitster@pobox.com>

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 <gitster@pobox.com>
---
 builtin-merge.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/builtin-merge.c b/builtin-merge.c
index f1c84d7..6cb804b 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;

-- 
1.6.6