Merge branch 'jk/uploadpack-packobjectshook-fix' into maint

diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index d92db62fbdf15c14ff3d85b767a069b22aa3897d..88b86c8d9f5a0ea9c49b42e891082203b80a977f 100644 (file)
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -172,7 +172,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
                        N_("write the content to temporary files")),
                OPT_STRING(0, "prefix", &state.base_dir, N_("string"),
                        N_("when creating files, prepend <string>")),
-               { OPTION_CALLBACK, 0, "stage", NULL, "1-3|all",
+               { OPTION_CALLBACK, 0, "stage", NULL, "(1|2|3|all)",
                        N_("copy out the files from named stage"),
                        PARSE_OPT_NONEG, option_parse_stage },
                OPT_END()