#!/bin/sh # # Copyright (c) 2010 Erick Mattos # global test_description := ''git checkout --orphan Main Tests for --orphan functionality.'' source ./test-lib.sh global TEST_FILE := 'foo' test_expect_success 'Setup' ' echo "Initial" >"$TEST_FILE" && git add "$TEST_FILE" && git commit -m "First Commit" && test_tick && echo "State 1" >>"$TEST_FILE" && git add "$TEST_FILE" && test_tick && git commit -m "Second Commit" ' test_expect_success '--orphan creates a new orphan branch from HEAD' ' git checkout --orphan alpha && test_must_fail git rev-parse --verify HEAD && test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" && test_tick && git commit -m "Third Commit" && test_must_fail git rev-parse --verify HEAD^ && git diff-tree --quiet master alpha ' test_expect_success '--orphan creates a new orphan branch from ' ' git checkout master && git checkout --orphan beta master^ && test_must_fail git rev-parse --verify HEAD && test "refs/heads/beta" = "$(git symbolic-ref HEAD)" && test_tick && git commit -m "Fourth Commit" && test_must_fail git rev-parse --verify HEAD^ && git diff-tree --quiet master^ beta ' test_expect_success '--orphan must be rejected with -b' ' git checkout master && test_must_fail git checkout --orphan new -b newer && test refs/heads/master = "$(git symbolic-ref HEAD)" ' test_expect_success '--orphan must be rejected with -t' ' git checkout master && test_must_fail git checkout --orphan new -t master && test refs/heads/master = "$(git symbolic-ref HEAD)" ' test_expect_success '--orphan ignores branch.autosetupmerge' ' git checkout master && git config branch.autosetupmerge always && git checkout --orphan gamma && test -z "$(git config branch.gamma.merge)" && test refs/heads/gamma = "$(git symbolic-ref HEAD)" && test_must_fail git rev-parse --verify HEAD^ ' test_expect_success '--orphan makes reflog by default' ' git checkout master && git config --unset core.logAllRefUpdates && git checkout --orphan delta && test_must_fail git rev-parse --verify delta@{0} && git commit -m Delta && git rev-parse --verify delta@{0} ' test_expect_success '--orphan does not make reflog when core.logAllRefUpdates = false' ' git checkout master && git config core.logAllRefUpdates false && git checkout --orphan epsilon && test_must_fail git rev-parse --verify epsilon@{0} && git commit -m Epsilon && test_must_fail git rev-parse --verify epsilon@{0} ' test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates = false' ' git checkout master && git checkout -l --orphan zeta && test_must_fail git rev-parse --verify zeta@{0} && git commit -m Zeta && git rev-parse --verify zeta@{0} ' test_expect_success 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog' ' git checkout master && git checkout -l --orphan eta && test_must_fail git rev-parse --verify eta@{0} && git checkout master && test_must_fail git rev-parse --verify eta@{0} ' test_expect_success '--orphan is rejected with an existing name' ' git checkout master && test_must_fail git checkout --orphan master && test refs/heads/master = "$(git symbolic-ref HEAD)" ' test_expect_success '--orphan refuses to switch if a merge is needed' ' git checkout master && git reset --hard && echo local >>"$TEST_FILE" && cat "$TEST_FILE" >"$TEST_FILE.saved" && test_must_fail git checkout --orphan new master^ && test refs/heads/master = "$(git symbolic-ref HEAD)" && test_cmp "$TEST_FILE" "$TEST_FILE.saved" && git diff-index --quiet --cached HEAD && git reset --hard ' test_expect_success 'cannot --detach on an unborn branch' ' git checkout master && git checkout --orphan new && test_must_fail git checkout --detach ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"git checkout --orphan\n"> <"\n"> <"Main Tests for --orphan functionality.">)} spids: [13] ) ] spids: [13] ) (C {(.)} {(./test-lib.sh)}) (Assignment keyword: Assign_None pairs: [(assign_pair lhs:(LhsName name:TEST_FILE) op:Equal rhs:{(foo)} spids:[26])] spids: [26] ) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\techo \"Initial\" >\"$TEST_FILE\" &&\n"> <"\tgit add \"$TEST_FILE\" &&\n"> <"\tgit commit -m \"First Commit\" &&\n"> <"\ttest_tick &&\n"> <"\techo \"State 1\" >>\"$TEST_FILE\" &&\n"> <"\tgit add \"$TEST_FILE\" &&\n"> <"\ttest_tick &&\n"> <"\tgit commit -m \"Second Commit\"\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan creates a new orphan branch from HEAD">)} { (SQ <"\n"> <"\tgit checkout --orphan alpha &&\n"> <"\ttest_must_fail git rev-parse --verify HEAD &&\n"> <"\ttest \"refs/heads/alpha\" = \"$(git symbolic-ref HEAD)\" &&\n"> <"\ttest_tick &&\n"> <"\tgit commit -m \"Third Commit\" &&\n"> <"\ttest_must_fail git rev-parse --verify HEAD^ &&\n"> <"\tgit diff-tree --quiet master alpha\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan creates a new orphan branch from ">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit checkout --orphan beta master^ &&\n"> <"\ttest_must_fail git rev-parse --verify HEAD &&\n"> <"\ttest \"refs/heads/beta\" = \"$(git symbolic-ref HEAD)\" &&\n"> <"\ttest_tick &&\n"> <"\tgit commit -m \"Fourth Commit\" &&\n"> <"\ttest_must_fail git rev-parse --verify HEAD^ &&\n"> <"\tgit diff-tree --quiet master^ beta\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan must be rejected with -b">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\ttest_must_fail git checkout --orphan new -b newer &&\n"> <"\ttest refs/heads/master = \"$(git symbolic-ref HEAD)\"\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan must be rejected with -t">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\ttest_must_fail git checkout --orphan new -t master &&\n"> <"\ttest refs/heads/master = \"$(git symbolic-ref HEAD)\"\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan ignores branch.autosetupmerge">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit config branch.autosetupmerge always &&\n"> <"\tgit checkout --orphan gamma &&\n"> <"\ttest -z \"$(git config branch.gamma.merge)\" &&\n"> <"\ttest refs/heads/gamma = \"$(git symbolic-ref HEAD)\" &&\n"> <"\ttest_must_fail git rev-parse --verify HEAD^\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan makes reflog by default">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit config --unset core.logAllRefUpdates &&\n"> <"\tgit checkout --orphan delta &&\n"> <"\ttest_must_fail git rev-parse --verify delta@{0} &&\n"> <"\tgit commit -m Delta &&\n"> <"\tgit rev-parse --verify delta@{0}\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan does not make reflog when core.logAllRefUpdates = false">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit config core.logAllRefUpdates false &&\n"> <"\tgit checkout --orphan epsilon &&\n"> <"\ttest_must_fail git rev-parse --verify epsilon@{0} &&\n"> <"\tgit commit -m Epsilon &&\n"> <"\ttest_must_fail git rev-parse --verify epsilon@{0}\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan with -l makes reflog when core.logAllRefUpdates = false">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit checkout -l --orphan zeta &&\n"> <"\ttest_must_fail git rev-parse --verify zeta@{0} &&\n"> <"\tgit commit -m Zeta &&\n"> <"\tgit rev-parse --verify zeta@{0}\n"> ) } ) (C {(test_expect_success)} { (SQ < "giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog" > ) } { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit checkout -l --orphan eta &&\n"> <"\ttest_must_fail git rev-parse --verify eta@{0} &&\n"> <"\tgit checkout master &&\n"> <"\ttest_must_fail git rev-parse --verify eta@{0}\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan is rejected with an existing name">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\ttest_must_fail git checkout --orphan master &&\n"> <"\ttest refs/heads/master = \"$(git symbolic-ref HEAD)\"\n"> ) } ) (C {(test_expect_success)} {(SQ <"--orphan refuses to switch if a merge is needed">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit reset --hard &&\n"> <"\techo local >>\"$TEST_FILE\" &&\n"> <"\tcat \"$TEST_FILE\" >\"$TEST_FILE.saved\" &&\n"> <"\ttest_must_fail git checkout --orphan new master^ &&\n"> <"\ttest refs/heads/master = \"$(git symbolic-ref HEAD)\" &&\n"> <"\ttest_cmp \"$TEST_FILE\" \"$TEST_FILE.saved\" &&\n"> <"\tgit diff-index --quiet --cached HEAD &&\n"> <"\tgit reset --hard\n"> ) } ) (C {(test_expect_success)} {(SQ <"cannot --detach on an unborn branch">)} { (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit checkout --orphan new &&\n"> <"\ttest_must_fail git checkout --detach\n"> ) } ) (C {(test_done)}) ] )