builtin-merge.c: call exclude_cmds() correctly.

apenwarr · gitster · commit ed87465658c8 · 2009-11-29T18:49:11.000-08:00
We need to call exclude_cmds() after the loop, not during the loop, because
excluding a command from the array can change the indexes of objects in the
array.  The result is that, depending on file ordering, some commands
weren't excluded as they should have been.

Signed-off-by: Avery Pennarun &lt;apenwarr@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-merge.c b/builtin-merge.c
@@ -106,8 +106,8 @@ static struct strategy *get_strategy(const char *name)
 					found = 1;
 			if (!found)
 				add_cmdname(&not_strategies, ent->name, ent->len);
-			exclude_cmds(&main_cmds, &not_strategies);
 		}
+		exclude_cmds(&main_cmds, &not_strategies);
 	}
 	if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {
 		fprintf(stderr, "Could not find merge strategy '%s'.\n", name);

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,8 @@ static struct strategy get_strategy(const char name)`
`106`	`106`	`found = 1;`
`107`	`107`	`if (!found)`
`108`	`108`	`add_cmdname(&not_strategies, ent->name, ent->len);`
`109`		`- exclude_cmds(&main_cmds, &not_strategies);`
`110`	`109`	`}`
	`110`	`+ exclude_cmds(&main_cmds, &not_strategies);`
`111`	`111`	`}`
`112`	`112`	`if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {`
`113`	`113`	`fprintf(stderr, "Could not find merge strategy '%s'.\n", name);`