(command.CommandList children: [ (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:test_description) op: assign_op.Equal rhs: {(SQ <'checkout '>)} spids: [4] ) ] ) (C {<.>} {<'./test-lib.sh'>}) (command.ShFunction name: do_checkout body: (BraceGroup children: [ (command.AndOr ops: [Id.Op_DAmp Id.Op_DAmp Id.Op_DAmp] children: [ (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:exp_branch) op: assign_op.Equal rhs: {($ Id.VSub_Number '$1')} spids: [46] ) ] ) (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:exp_ref) op: assign_op.Equal rhs: {(DQ <'refs/heads/'> ($ Id.VSub_DollarName '$exp_branch'))} spids: [52] ) ] ) (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:exp_sha) op: assign_op.Equal rhs: { (braced_var_sub token: <Id.VSub_Number 2> suffix_op: (suffix_op.Unary tok: <Id.VTest_ColonHyphen ':-'> arg_word: { (command_sub left_token: <Id.Left_DollarParen '$('> child: (C {<git>} {<rev-parse>} {<--verify>} {<HEAD>}) ) } ) ) } spids: [66] ) ] ) (command.If arms: [ (if_arm cond: (condition.Shell commands: [ (command.Sentence child: (C {<Id.Lit_LBracket '['>} {<-z>} {(DQ ($ Id.VSub_Number '$3'))} {<Id.Lit_RBracket ']'>} ) terminator: <Id.Op_Semi _> ) ] ) action: [ (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:opts) op: assign_op.Equal rhs: {(DQ <-b>)} spids: [105] ) ] ) ] spids: [89 102] ) ] else_action: [ (command.ShAssignment pairs: [ (assign_pair lhs: (sh_lhs_expr.Name name:opts) op: assign_op.Equal rhs: {(DQ ($ Id.VSub_Number '$3'))} spids: [114] ) ] ) ] ) ] ) (command.AndOr ops: [Id.Op_DAmp Id.Op_DAmp] children: [ (C {<git>} {<checkout>} {($ Id.VSub_DollarName '$opts')} {($ Id.VSub_DollarName '$exp_branch')} {($ Id.VSub_DollarName '$exp_sha')} ) (C {<test>} {($ Id.VSub_DollarName '$exp_ref')} {<Id.Lit_Equals '='>} { (command_sub left_token: <Id.Left_DollarParen '$('> child: (C {<git>} {<rev-parse>} {<--symbolic-full-name>} {<HEAD>}) ) } ) (C {<test>} {($ Id.VSub_DollarName '$exp_sha')} {<Id.Lit_Equals '='>} { (command_sub left_token: <Id.Left_DollarParen '$('> child: (C {<git>} {<rev-parse>} {<--verify>} {<HEAD>}) ) } ) ] ) ] ) ) (command.ShFunction name: test_dirty_unmergeable body: (BraceGroup children: [ (command.Pipeline children: [ (command.Simple words: [{<git>} {<diff>} {<--exit-code>}] redirects: [ (redir op: <Id.Redir_Great '>'> loc: (redir_loc.Fd fd:1) arg: {<'/dev/null'>} ) ] do_fork: T ) ] negated: T ) ] ) ) (command.ShFunction name: setup_dirty_unmergeable body: (BraceGroup children: [ (command.Simple words: [{<echo>} {<change2>}] redirects: [(redir op:<Id.Redir_DGreat '>>'> loc:(redir_loc.Fd fd:1) arg:{<file1>})] do_fork: T ) ] ) ) (command.ShFunction name: test_dirty_mergeable body: (BraceGroup children: [ (command.Pipeline children: [ (command.Simple words: [{<git>} {<diff>} {<--cached>} {<--exit-code>}] redirects: [ (redir op: <Id.Redir_Great '>'> loc: (redir_loc.Fd fd:1) arg: {<'/dev/null'>} ) ] do_fork: T ) ] negated: T ) ] ) ) (command.ShFunction name: setup_dirty_mergeable body: (BraceGroup children: [ (command.AndOr ops: [Id.Op_DAmp] children: [ (command.Simple words: [{<echo>} {<file2>}] redirects: [(redir op:<Id.Redir_Great '>'> loc:(redir_loc.Fd fd:1) arg:{<file2>})] do_fork: T ) (C {<git>} {<add>} {<file2>}) ] ) ] ) ) (C {<test_expect_success>} {(SQ <setup>)} { (SQ <'\n'> <'\ttest_commit initial file1 &&\n'> <'\tHEAD1=$(git rev-parse --verify HEAD) &&\n'> <'\n'> <'\ttest_commit change1 file1 &&\n'> <'\tHEAD2=$(git rev-parse --verify HEAD) &&\n'> <'\n'> <'\tgit branch -m branch1\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -b to a new branch, set to HEAD'>)} {(SQ <'\n'> <'\tdo_checkout branch2\n'>)} ) (C {<test_expect_success>} {(SQ <'checkout -b to a new branch, set to an explicit ref'>)} { (SQ <'\n'> <'\tgit checkout branch1 &&\n'> <'\tgit branch -D branch2 &&\n'> <'\n'> <'\tdo_checkout branch2 $HEAD1\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -b to a new branch with unmergeable changes fails'>)} { (SQ <'\n'> <'\tgit checkout branch1 &&\n'> <'\n'> <'\t# clean up from previous test\n'> <'\tgit branch -D branch2 &&\n'> <'\n'> <'\tsetup_dirty_unmergeable &&\n'> <'\ttest_must_fail do_checkout branch2 $HEAD1 &&\n'> <'\ttest_dirty_unmergeable\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -f -b to a new branch with unmergeable changes discards changes'>)} { (SQ <'\n'> <'\t# still dirty and on branch1\n'> <'\tdo_checkout branch2 $HEAD1 "-f -b" &&\n'> <'\ttest_must_fail test_dirty_unmergeable\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -b to a new branch preserves mergeable changes'>)} { (SQ <'\n'> <'\tgit checkout branch1 &&\n'> <'\n'> <'\t# clean up from previous test\n'> <'\tgit branch -D branch2 &&\n'> <'\n'> <'\tsetup_dirty_mergeable &&\n'> <'\tdo_checkout branch2 $HEAD1 &&\n'> <'\ttest_dirty_mergeable\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -f -b to a new branch with mergeable changes discards changes'>)} { (SQ <'\n'> <'\t# clean up from previous test\n'> <'\tgit reset --hard &&\n'> <'\n'> <'\tgit checkout branch1 &&\n'> <'\n'> <'\t# clean up from previous test\n'> <'\tgit branch -D branch2 &&\n'> <'\n'> <'\tsetup_dirty_mergeable &&\n'> <'\tdo_checkout branch2 $HEAD1 "-f -b" &&\n'> <'\ttest_must_fail test_dirty_mergeable\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -b to an existing branch fails'>)} { (SQ <'\n'> <'\tgit reset --hard HEAD &&\n'> <'\n'> <'\ttest_must_fail do_checkout branch2 $HEAD2\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -b to @{-1} fails with the right branch name'>)} { (SQ <'\n'> <'\tgit reset --hard HEAD &&\n'> <'\tgit checkout branch1 &&\n'> <'\tgit checkout branch2 &&\n'> <'\techo >expect "fatal: A branch named '> ) (word_part.EscapedLiteral token:<Id.Lit_EscapedChar '\\\''>) (SQ <branch1>) (word_part.EscapedLiteral token:<Id.Lit_EscapedChar '\\\''>) (SQ <' already exists." &&\n'> <'\ttest_must_fail git checkout -b @{-1} 2>actual &&\n'> <'\ttest_i18ncmp expect actual\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -B to an existing branch resets branch to HEAD'>)} {(SQ <'\n'> <'\tgit checkout branch1 &&\n'> <'\n'> <'\tdo_checkout branch2 "" -B\n'>)} ) (C {<test_expect_success>} {(SQ <'checkout -B to an existing branch from detached HEAD resets branch to HEAD'>)} { (SQ <'\n'> <'\tgit checkout $(git rev-parse --verify HEAD) &&\n'> <'\n'> <'\tdo_checkout branch2 "" -B\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -B to an existing branch with an explicit ref resets branch to that ref'>)} {(SQ <'\n'> <'\tgit checkout branch1 &&\n'> <'\n'> <'\tdo_checkout branch2 $HEAD1 -B\n'>)} ) (C {<test_expect_success>} {(SQ <'checkout -B to an existing branch with unmergeable changes fails'>)} { (SQ <'\n'> <'\tgit checkout branch1 &&\n'> <'\n'> <'\tsetup_dirty_unmergeable &&\n'> <'\ttest_must_fail do_checkout branch2 $HEAD1 -B &&\n'> <'\ttest_dirty_unmergeable\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -f -B to an existing branch with unmergeable changes discards changes'>)} { (SQ <'\n'> <'\t# still dirty and on branch1\n'> <'\tdo_checkout branch2 $HEAD1 "-f -B" &&\n'> <'\ttest_must_fail test_dirty_unmergeable\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -B to an existing branch preserves mergeable changes'>)} { (SQ <'\n'> <'\tgit checkout branch1 &&\n'> <'\n'> <'\tsetup_dirty_mergeable &&\n'> <'\tdo_checkout branch2 $HEAD1 -B &&\n'> <'\ttest_dirty_mergeable\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -f -B to an existing branch with mergeable changes discards changes'>)} { (SQ <'\n'> <'\t# clean up from previous test\n'> <'\tgit reset --hard &&\n'> <'\n'> <'\tgit checkout branch1 &&\n'> <'\n'> <'\tsetup_dirty_mergeable &&\n'> <'\tdo_checkout branch2 $HEAD1 "-f -B" &&\n'> <'\ttest_must_fail test_dirty_mergeable\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -b <describe>'>)} { (SQ <'\n'> <'\tgit tag -f -m "First commit" initial initial &&\n'> <'\tgit checkout -f change1 &&\n'> <'\tname=$(git describe) &&\n'> <'\tgit checkout -b $name &&\n'> <'\tgit diff --exit-code change1 &&\n'> <'\techo "refs/heads/$name" >expect &&\n'> <'\tgit symbolic-ref HEAD >actual &&\n'> <'\ttest_cmp expect actual\n'> ) } ) (C {<test_expect_success>} {(SQ <'checkout -B to the current branch works'>)} { (SQ <'\n'> <'\tgit checkout branch1 &&\n'> <'\tgit checkout -B branch1-scratch &&\n'> <'\n'> <'\tsetup_dirty_mergeable &&\n'> <'\tgit checkout -B branch1-scratch initial &&\n'> <'\ttest_dirty_mergeable\n'> ) } ) (C {<test_done>}) ] )