wt-status: collect untracked files in a separate "collect" phase

diff --git a/builtin-show-branch.c b/builtin-show-branch.c
index b1affd2ffbbff955d24ed0a32b2d89d1ae7fe024..01bea3b583b53f4930a1ab17d64b1b714f58099c 100644 (file)
--- a/builtin-show-branch.c
+++ b/builtin-show-branch.c
@@ -657,8 +657,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                            "color '*!+-' corresponding to the branch"),
                { OPTION_INTEGER, 0, "more", &extra, "n",
                            "show <n> more commits after the common ancestor",
-                           PARSE_OPT_OPTARG | PARSE_OPT_LASTARG_DEFAULT,
-                           NULL, (intptr_t)1 },
+                           PARSE_OPT_OPTARG, NULL, (intptr_t)1 },
                OPT_SET_INT(0, "list", &extra, "synonym to more=-1", -1),
                OPT_BOOLEAN(0, "no-name", &no_name, "suppress naming strings"),
                OPT_BOOLEAN(0, "current", &with_current_branch,
@@ -697,7 +696,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                av = default_arg - 1; /* ick; we would not address av[0] */
        }
 
-       ac = parse_options(ac, av, builtin_show_branch_options,
+       ac = parse_options(ac, av, prefix, builtin_show_branch_options,
                           show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);
        if (all_heads)
                all_remotes = 1;