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
=main
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 main alpha
38 test_expect_success
'--orphan creates a new orphan branch from <start_point>' '
40 git checkout --orphan beta main^ &&
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 main^ beta
49 test_expect_success
'--orphan must be rejected with -b' '
51 test_must_fail git checkout --orphan new -b newer &&
52 test refs/heads/main = "$(git symbolic-ref HEAD)"
55 test_expect_success
'--orphan must be rejected with -t' '
57 test_must_fail git checkout --orphan new -t main &&
58 test refs/heads/main = "$(git symbolic-ref HEAD)"
61 test_expect_success
'--orphan ignores branch.autosetupmerge' '
63 git config branch.autosetupmerge always &&
64 git checkout --orphan gamma &&
65 test_cmp_config "" --default "" branch.gamma.merge &&
66 test refs/heads/gamma = "$(git symbolic-ref HEAD)" &&
67 test_must_fail git rev-parse --verify HEAD^ &&
69 git config branch.autosetupmerge inherit &&
70 git checkout --orphan eta &&
71 test_cmp_config "" --default "" branch.eta.merge &&
72 test_cmp_config "" --default "" branch.eta.remote &&
73 echo refs/heads/eta >expected &&
74 git symbolic-ref HEAD >actual &&
75 test_cmp expected actual &&
76 test_must_fail git rev-parse --verify HEAD^
79 test_expect_success
'--orphan makes reflog by default' '
81 git config --unset core.logAllRefUpdates &&
82 git checkout --orphan delta &&
83 test_must_fail git rev-parse --verify delta@{0} &&
84 git commit -m Delta &&
85 git rev-parse --verify delta@{0}
88 test_expect_success REFFILES
'--orphan does not make reflog when core.logAllRefUpdates = false' '
90 git config core.logAllRefUpdates false &&
91 git checkout --orphan epsilon &&
92 test_must_fail git rev-parse --verify epsilon@{0} &&
93 git commit -m Epsilon &&
94 test_must_fail git rev-parse --verify epsilon@{0}
97 test_expect_success
'--orphan with -l makes reflog when core.logAllRefUpdates = false' '
99 git checkout -l --orphan zeta &&
100 test_must_fail git rev-parse --verify zeta@{0} &&
101 git commit -m Zeta &&
102 git rev-parse --verify zeta@{0}
105 test_expect_success
'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog' '
107 git checkout -l --orphan eta &&
108 test_must_fail git rev-parse --verify eta@{0} &&
110 test_must_fail git rev-parse --verify eta@{0}
113 test_expect_success
'--orphan is rejected with an existing name' '
115 test_must_fail git checkout --orphan main &&
116 test refs/heads/main = "$(git symbolic-ref HEAD)"
119 test_expect_success
'--orphan refuses to switch if a merge is needed' '
122 echo local >>"$TEST_FILE" &&
123 cat "$TEST_FILE" >"$TEST_FILE.saved" &&
124 test_must_fail git checkout --orphan new main^ &&
125 test refs/heads/main = "$(git symbolic-ref HEAD)" &&
126 test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
127 git diff-index --quiet --cached HEAD &&
131 test_expect_success
'cannot --detach on an unborn branch' '
133 git checkout --orphan new &&
134 test_must_fail git checkout --detach