blob: 2e47fe01cfaf565777c9359e7c2675ef051c33e3 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
#!/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 'check ambiguity in subdir' '
mkdir sub &&
# not ambiguous because sub/world does not exist
git -C sub checkout world ../all &&
echo hello >sub/world &&
# ambiguous because sub/world does exist
test_must_fail git -C sub 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 &&
test_i18ngrep 2 actual &&
test_i18ngrep "one reference expected, 2 given" actual
'
test_done
|
