]> granicus.if.org Git - git/commitdiff
builtin/push.c: fix description of --recurse-submodules option
authorRalf Thielow <ralf.thielow@gmail.com>
Tue, 18 Nov 2014 17:57:46 +0000 (18:57 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Nov 2014 19:19:16 +0000 (11:19 -0800)
The description of the option for argument "recurse-submodules"
is marked for translation even if it expects the untranslated
string and it's missing the option "on-demand" which was introduced
in eb21c73 (2014-03-29, push: teach --recurse-submodules the on-demand
option). Fix this by unmark the string for translation and add the
missing option.

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/push.c

index 7b1b66c36ac14cb29db9dbbbd5b6f4d27b67d91c..17fc31dd0d600e0ee8b42e891cccbdc58f58ff95 100644 (file)
@@ -463,7 +463,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)
                  0, CAS_OPT_NAME, &cas, N_("refname>:<expect"),
                  N_("require old value of ref to be at this value"),
                  PARSE_OPT_OPTARG, parseopt_push_cas_option },
-               { OPTION_CALLBACK, 0, "recurse-submodules", &flags, N_("check"),
+               { OPTION_CALLBACK, 0, "recurse-submodules", &flags, "check|on-demand",
                        N_("control recursive pushing of submodules"),
                        PARSE_OPT_OPTARG, option_parse_recurse_submodules },
                OPT_BOOL( 0 , "thin", &thin, N_("use thin pack")),