From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Dec 2009 06:23:54 +0000 (-0800)
Subject: builtin-merge.c: use standard active_cache macros
X-Git-Tag: v1.7.0-rc0~61^2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be6ff8196d9890c1875a75b96320b863dd1fe815;p=git.git

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 <gitster@pobox.com>
---

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;