mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-01 19:26:10 +02:00
Code

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>
This commit is contained in:
Junio C Hamano 2009-12-17 22:23:54 -08:00
parent 902f235378
commit be6ff8196d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin-merge.c
View File

@ -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;