Rohit Ashiwal <rohit.ashiwal...@gmail.com> writes:
> + if (opts->ignore_whitespace) {
> + struct strbuf buf = STRBUF_INIT;
> +
> + if (opts->strategy_opts)
> + strbuf_addstr(&buf, opts->strategy_opts);
> +
> + strbuf_addstr(&buf, " --ignore-space-change");
> + free(opts->strategy_opts);
Is this call to free() safe?
> + opts->strategy_opts = strbuf_detach(&buf, NULL);
> + }
> +
> @@ -1821,6 +1836,9 @@ int cmd_rebase(int argc, const char **argv, const char
> *prefix)
> }
>
> if (options.rebase_merges) {
> + if (options.ignore_whitespace)
> + die(_("cannot combine '--rebase-merges' with "
> + "'--ignore-whitespace'"));
Hmph, this is unfortunate. The patch is not making things worse, though.
