Michael Grubb <devel@xxxxxxxxxxxxx> writes:
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 0bdd19a..9e5b6bd 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -505,9 +505,18 @@ cleanup:
>
> static int git_merge_config(const char *k, const char *v, void *cb)
> {
> - if (branch && !prefixcmp(k, "branch.") &&
> - !prefixcmp(k + 7, branch) &&
> - !strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
> + static int branch_merge_options_set = 0;
I prefer to avoid "static int" that you cannot easily clear here. It
would make it impossible to call the function twice.
I think it is easily doable by using the callback parameter (cb).
I am also wondering how this will scale, both in the direction of "later
it is likely that we would want to support a glob not just '*' here", and
also "later it is likely that we would want to support other per-branch
variables, not just "mergeoptions" here".
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html