On Mon, Mar 31, 2014 at 10:37 PM, Jens Lehmann <jens.lehm...@web.de> wrote:
> ... maybe the best way is to leave index_differs_from() unchanged
> and call that function with the correct diff_flags instead:
>
> +               int diff_flags = DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
> +               if (ignore_submodule_arg &&
> +                   !strcmp(ignore_submodule_arg, "all"))
> +                       diff_flags |= DIFF_OPT_IGNORE_SUBMODULES;
> +               commitable = index_differs_from(parent, diff_flags);
>
> Not thoroughly tested yet, but that'd also prevent any fallout for
> the two callsites of index_differs_from() in sequencer.c.

Thanks for this hint, that is really much nicer. I'll test that, and
post updated patch if it works.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to