[PATCH v4 2/2] checkout: proper error message on 'git checkout foo bar --'
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Oct 18, 2013, 09:25 UTC
- Message-ID
- <1382088358-2213-2-git-send-email-Matthieu.Moy@imag.fr>
- In-Reply-To
- <1382088358-2213-1-git-send-email-Matthieu.Moy@imag.fr>
The previous code was detecting the presence of "--" by looking only at argument 1. As a result, "git checkout foo bar --" was interpreted as an ambiguous file/revision list, and errored out with:
error: pathspec 'foo' did not match any file(s) known to git. error: pathspec 'bar' did not match any file(s) known to git. error: pathspec '--' did not match any file(s) known to git.
This patch fixes it by walking through the argument list to find the "--", and now complains about the number of references given.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- Unchanged since v3.
builtin/checkout.c | 21 ++++++++++++++++----- t/t2010-checkout-ambiguous.sh | 6 ++++++ 2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c index 2003795..54f80bd 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -873,7 +873,9 @@ static int parse_branchname_arg(int argc, const char **argv, int argcount = 0; unsigned char branch_rev[20]; const char *arg; - int has_dash_dash; + int dash_dash_pos; + int has_dash_dash = 0; + int i; /* * case 1: git checkout <ref> -- [<paths>] @@ -917,11 +919,20 @@ static int parse_branchname_arg(int argc, const char **argv, if (!argc) return 0; - if (!strcmp(argv[0], "--")) /* case (2) */ - return 1; - arg = argv[0]; - has_dash_dash = (argc > 1) && !strcmp(argv[1], "--"); + dash_dash_pos = -1; + for (i = 0; i < argc; i++) { + if (!strcmp(argv[i], "--")) { + dash_dash_pos = i; + break; + } + } + if (dash_dash_pos == 0) + return 1; /* case (2) */ + else if (dash_dash_pos == 1) + has_dash_dash = 1; /* case (3) or (1) */ + else if (dash_dash_pos >= 2) + die(_("only one reference expected, %d given."), dash_dash_pos); if (!strcmp(arg, "-")) arg = "@{-1}"; diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh index 7cc0a35..87bdf9c 100755 --- a/t/t2010-checkout-ambiguous.sh +++ b/t/t2010-checkout-ambiguous.sh @@ -47,4 +47,10 @@ test_expect_success 'disambiguate checking out from a tree-ish' ' git diff --exit-code --quiet ' +test_expect_success 'accurate error message with more than one ref' ' + test_must_fail git checkout HEAD master -- 2>actual && + grep 2 actual && + test_i18ngrep "one reference expected, 2 given" actual +' + test_done
-- 1.8.4.479.g0ed768e