3 # Copyright (c) 2010 Erick Mattos
6 test_description='git checkout --orphan
8 Main Tests for --orphan functionality.'
10 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
11 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
17 test_expect_success 'Setup' '
18 echo "Initial" >"$TEST_FILE" &&
19 git add "$TEST_FILE" &&
20 git commit -m "First Commit" &&
22 echo "State 1" >>"$TEST_FILE" &&
23 git add "$TEST_FILE" &&
25 git commit -m "Second Commit"
28 test_expect_success '--orphan creates a new orphan branch from HEAD' '
29 git checkout --orphan alpha &&
30 test_must_fail git rev-parse --verify HEAD &&
31 test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" &&
33 git commit -m "Third Commit" &&
34 test_must_fail git rev-parse --verify HEAD^ &&
35 git diff-tree --quiet master alpha
38 test_expect_success '--orphan creates a new orphan branch from <start_point>' '
39 git checkout master &&
40 git checkout --orphan beta master^ &&
41 test_must_fail git rev-parse --verify HEAD &&
42 test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
44 git commit -m "Fourth Commit" &&
45 test_must_fail git rev-parse --verify HEAD^ &&
46 git diff-tree --quiet master^ beta
49 test_expect_success '--orphan must be rejected with -b' '
50 git checkout master &&
51 test_must_fail git checkout --orphan new -b newer &&
52 test refs/heads/master = "$(git symbolic-ref HEAD)"
55 test_expect_success '--orphan must be rejected with -t' '
56 git checkout master &&
57 test_must_fail git checkout --orphan new -t master &&
58 test refs/heads/master = "$(git symbolic-ref HEAD)"
61 test_expect_success '--orphan ignores branch.autosetupmerge' '
62 git checkout master &&
63 git config branch.autosetupmerge always &&
64 git checkout --orphan gamma &&
65 test -z "$(git config branch.gamma.merge)" &&
66 test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
67 test_must_fail git rev-parse --verify HEAD^
70 test_expect_success '--orphan makes reflog by default' '
71 git checkout master &&
72 git config --unset core.logAllRefUpdates &&
73 git checkout --orphan delta &&
74 test_must_fail git rev-parse --verify delta@{0} &&
75 git commit -m Delta &&
76 git rev-parse --verify delta@{0}
79 test_expect_success '--orphan does not make reflog when core.logAllRefUpdates = false' '
80 git checkout master &&
81 git config core.logAllRefUpdates false &&
82 git checkout --orphan epsilon &&
83 test_must_fail git rev-parse --verify epsilon@{0} &&
84 git commit -m Epsilon &&
85 test_must_fail git rev-parse --verify epsilon@{0}
88 test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates = false' '
89 git checkout master &&
90 git checkout -l --orphan zeta &&
91 test_must_fail git rev-parse --verify zeta@{0} &&
93 git rev-parse --verify zeta@{0}
96 test_expect_success 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog' '
97 git checkout master &&
98 git checkout -l --orphan eta &&
99 test_must_fail git rev-parse --verify eta@{0} &&
100 git checkout master &&
101 test_must_fail git rev-parse --verify eta@{0}
104 test_expect_success '--orphan is rejected with an existing name' '
105 git checkout master &&
106 test_must_fail git checkout --orphan master &&
107 test refs/heads/master = "$(git symbolic-ref HEAD)"
110 test_expect_success '--orphan refuses to switch if a merge is needed' '
111 git checkout master &&
113 echo local >>"$TEST_FILE" &&
114 cat "$TEST_FILE" >"$TEST_FILE.saved" &&
115 test_must_fail git checkout --orphan new master^ &&
116 test refs/heads/master = "$(git symbolic-ref HEAD)" &&
117 test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
118 git diff-index --quiet --cached HEAD &&
122 test_expect_success 'cannot --detach on an unborn branch' '
123 git checkout master &&
124 git checkout --orphan new &&
125 test_must_fail git checkout --detach