Hans Jerry Illikainen <hji@xxxxxxxxxxxx> writes:
> +static unsigned gpg_flags = GPG_VERIFY_SHORT | GPG_VERIFY_COMPAT;
> static struct strbuf merge_msg = STRBUF_INIT;
> static struct strategy **use_strategies;
> static size_t use_strategies_nr, use_strategies_alloc;
> @@ -633,7 +633,7 @@ static int git_merge_config(const char *k, const char *v, void *cb)
> sign_commit = git_config_bool(k, v) ? "" : NULL;
> return 0;
> } else if (!strcmp(k, "gpg.mintrustlevel")) {
> - check_trust_level = 0;
> + gpg_flags ^= GPG_VERIFY_COMPAT;
Did you really mean to "toggle the bit each time the variable
appears"? Or is this better written as
gpg_flags &= ~GPG_VERIFY_COMPAT;
instead? There may be another instance of the same in this patch.
