Jeff King <p...@peff.net> writes:
> This is a pretty horrible UI trap. Most of the time with pathspecs we
> require them to be on the right-hand side of a "--" unless the paths
> actually exist in the filesystem. But then, in most of those cases we're
> making sure they're not ambiguous between revisions and paths. So maybe
> it's overkill here. I dunno. But the patch below certainly makes what's
> going on in your case less subtle:
>
> $ git status -u no
> fatal: no: no such path in the working tree.
> Use 'git <command> -- <path>...' to specify paths that do not exist locally.
Yeah. It was a mistake that we gave a short-and-sweet "-u" too
hastily to a relatively useless form that does not take any argument
and ended up needing to resort to the optional-arg trick.
> You do still have to figure out why it wasn't stuck to "-u", though.
Sorry, but I am not sure what you mean by this comment.
Your illustration patch lets you say "no, 'no' is not a pathspec"
with
git status -u no --
and "I want the unadorned -u and am asking about stuff in the 'no'
subdirectory" with
git status -u -- no
but in the former, it would not make 'no' an arg to '-u' by saying
"'no' is not a pathspec", would it?
> ---
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 2986553d5f..7177d7d82f 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1300,6 +1300,16 @@ static int git_status_config(const char *k, const char
> *v, void *cb)
> return git_diff_ui_config(k, v, NULL);
> }
>
> +static void verify_pathspec(const char *prefix, const char **argv)
> +{
> + while (*argv) {
> + const char *arg = *argv++;
> + if (!strcmp(arg, "--"))
> + return;
> + verify_filename(prefix, arg, 0);
> + }
> +}
> +
> int cmd_status(int argc, const char **argv, const char *prefix)
> {
> static int no_renames = -1;
> @@ -1351,7 +1361,7 @@ int cmd_status(int argc, const char **argv, const char
> *prefix)
> status_init_config(&s, git_status_config);
> argc = parse_options(argc, argv, prefix,
> builtin_status_options,
> - builtin_status_usage, 0);
> + builtin_status_usage, PARSE_OPT_KEEP_DASHDASH);
> finalize_colopts(&s.colopts, -1);
> finalize_deferred_config(&s);
>
> @@ -1362,6 +1372,7 @@ int cmd_status(int argc, const char **argv, const char
> *prefix)
> s.show_untracked_files == SHOW_NO_UNTRACKED_FILES)
> die(_("Unsupported combination of ignored and untracked-files
> arguments"));
>
> + verify_pathspec(prefix, argv);
> parse_pathspec(&s.pathspec, 0,
> PATHSPEC_PREFER_FULL,
> prefix, argv);
