Git fork
at reftables-rust 50 lines 1.7 kB view raw
1#!/bin/sh 2 3test_description='tests for git branch --track' 4 5GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main 6export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 7 8. ./test-lib.sh 9 10test_expect_success 'setup' ' 11 test_commit one && 12 test_commit two 13' 14 15test_expect_success 'checkout --track -b creates a new tracking branch' ' 16 git checkout --track -b branch1 main && 17 test $(git rev-parse --abbrev-ref HEAD) = branch1 && 18 test $(git config --get branch.branch1.remote) = . && 19 test $(git config --get branch.branch1.merge) = refs/heads/main 20' 21 22test_expect_success 'checkout --track -b rejects an extra path argument' ' 23 test_must_fail git checkout --track -b branch2 main one.t 2>err && 24 test_grep "cannot be used with updating paths" err 25' 26 27test_expect_success 'checkout --track -b overrides autoSetupMerge=inherit' ' 28 # Set up tracking config on main 29 test_config branch.main.remote origin && 30 test_config branch.main.merge refs/heads/some-branch && 31 test_config branch.autoSetupMerge inherit && 32 # With --track=inherit, we copy the tracking config from main 33 git checkout --track=inherit -b b1 main && 34 test_cmp_config origin branch.b1.remote && 35 test_cmp_config refs/heads/some-branch branch.b1.merge && 36 # With branch.autoSetupMerge=inherit, we do the same 37 git checkout -b b2 main && 38 test_cmp_config origin branch.b2.remote && 39 test_cmp_config refs/heads/some-branch branch.b2.merge && 40 # But --track overrides this 41 git checkout --track -b b3 main && 42 test_cmp_config . branch.b3.remote && 43 test_cmp_config refs/heads/main branch.b3.merge && 44 # And --track=direct does as well 45 git checkout --track=direct -b b4 main && 46 test_cmp_config . branch.b4.remote && 47 test_cmp_config refs/heads/main branch.b4.merge 48' 49 50test_done