Stefan Beller <sbel...@google.com> writes:

> +             else {
> +                     submodule->update_command = NULL;
> +                     if (!strcmp(value, "none"))
> +                             submodule->update = SM_UPDATE_NONE;
> +                     else if (!strcmp(value, "checkout"))
> +                             submodule->update = SM_UPDATE_CHECKOUT;
> +                     else if (!strcmp(value, "rebase"))
> +                             submodule->update = SM_UPDATE_REBASE;
> +                     else if (!strcmp(value, "merge"))
> +                             submodule->update = SM_UPDATE_MERGE;
> +                     else if (!skip_prefix(value, "!", 
> &submodule->update_command))
> +                             die(_("invalid value for %s"), var);
> +             }

I think this "string to enum" parser can become a separate helper
function in this patch, so that later patch can use it to parse the
"--update" option in the update_clone() function.

That would solve the slight inconsistency we have seen

+               if ((pp->update && !strcmp(pp->update, "none")) ||
+                   (!pp->update && sub->update == SM_UPDATE_NONE)) {

in that patch.
--
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