mirror of
https://github.com/git/git.git
synced 2024-11-05 08:47:56 +01:00
bca3969534
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>
56 lines
1.3 KiB
Bash
Executable file
56 lines
1.3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='checkout and pathspecs/refspecs ambiguities'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
echo hello >world &&
|
|
echo hello >all &&
|
|
git add all world &&
|
|
git commit -m initial &&
|
|
git branch world
|
|
'
|
|
|
|
test_expect_success 'reference must be a tree' '
|
|
test_must_fail git checkout $(git hash-object ./all) --
|
|
'
|
|
|
|
test_expect_success 'branch switching' '
|
|
test "refs/heads/master" = "$(git symbolic-ref HEAD)" &&
|
|
git checkout world -- &&
|
|
test "refs/heads/world" = "$(git symbolic-ref HEAD)"
|
|
'
|
|
|
|
test_expect_success 'checkout world from the index' '
|
|
echo bye > world &&
|
|
git checkout -- world &&
|
|
git diff --exit-code --quiet
|
|
'
|
|
|
|
test_expect_success 'non ambiguous call' '
|
|
git checkout all
|
|
'
|
|
|
|
test_expect_success 'allow the most common case' '
|
|
git checkout world &&
|
|
test "refs/heads/world" = "$(git symbolic-ref HEAD)"
|
|
'
|
|
|
|
test_expect_success 'check ambiguity' '
|
|
test_must_fail git checkout world all
|
|
'
|
|
|
|
test_expect_success 'disambiguate checking out from a tree-ish' '
|
|
echo bye > world &&
|
|
git checkout world -- world &&
|
|
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
|