diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2013-10-18 11:25:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-18 12:57:16 -0700 |
| commit | bca39695343ecb113b30c72a3b2e0cb7e73757d8 (patch) | |
| tree | 1694059fa4ce68468a592c0072b6f6d2bb654d1c /t/t2010-checkout-ambiguous.sh | |
| parent | a047fafc7866cc4087201e284dc1f53e8f9a32d5 (diff) | |
| download | git-bca39695343ecb113b30c72a3b2e0cb7e73757d8.tar.gz | |
checkout: proper error message on 'git checkout foo bar --'mm/checkout-auto-track-fix
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2010-checkout-ambiguous.sh')
| -rwxr-xr-x | t/t2010-checkout-ambiguous.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh index 7cc0a3582e..87bdf9c96b 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 |