Merge branch 'ap/maint-merge-strategy-list-fix'

gitster · gitster · commit 22c4e72d6eef · 2009-11-30T14:44:43.000-08:00
diff --git a/builtin-merge.c b/builtin-merge.c
@@ -107,8 +107,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
`@@ -107,8 +107,8 @@ static struct strategy get_strategy(const char name)`
`107`	`107`	`found = 1;`
`108`	`108`	`if (!found)`
`109`	`109`	`add_cmdname(&not_strategies, ent->name, ent->len);`
`110`		`- exclude_cmds(&main_cmds, &not_strategies);`
`111`	`110`	`}`
	`111`	`+ exclude_cmds(&main_cmds, &not_strategies);`
`112`	`112`	`}`
`113`	`113`	`if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) {`
`114`	`114`	`fprintf(stderr, "Could not find merge strategy '%s'.\n", name);`