GIT 1.5.5-rc2

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 55558aba8b862b93cb8ad97a681a4749bae3b3e1..3111baa9e38ecf96de6385dc9241ea8c992e4992 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -20,6 +20,8 @@ Test switching across them.
 
 . ./test-lib.sh
 
+test_tick
+
 fill () {
        for i
        do
@@ -30,9 +32,10 @@ fill () {
 
 test_expect_success setup '
 
+       fill x y z > same &&
        fill 1 2 3 4 5 6 7 8 >one &&
        fill a b c d e >two &&
-       git add one two &&
+       git add same one two &&
        git commit -m "Initial A one, A two" &&
 
        git checkout -b renamer &&
@@ -74,27 +77,48 @@ test_expect_success "checkout with dirty tree without -m" '
 
 '
 
+test_expect_success "checkout with unrelated dirty tree without -m" '
+
+       git checkout -f master &&
+       fill 0 1 2 3 4 5 6 7 8 >same &&
+       cp same kept
+       git checkout side >messages &&
+       test_cmp same kept
+       (cat > messages.expect <<EOF
+M      same
+EOF
+) &&
+       touch messages.expect &&
+       test_cmp messages.expect messages
+'
+
 test_expect_success "checkout -m with dirty tree" '
 
        git checkout -f master &&
        git clean -f &&
 
        fill 0 1 2 3 4 5 6 7 8 >one &&
-       git checkout -m side &&
+       git checkout -m side > messages &&
 
        test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
 
+       (cat >expect.messages <<EOF
+M      one
+EOF
+) &&
+       test_cmp expect.messages messages &&
+
        fill "M one" "A three" "D       two" >expect.master &&
        git diff --name-status master >current.master &&
-       diff expect.master current.master &&
+       test_cmp expect.master current.master &&
 
        fill "M one" >expect.side &&
        git diff --name-status side >current.side &&
-       diff expect.side current.side &&
+       test_cmp expect.side current.side &&
 
        : >expect.index &&
        git diff --cached >current.index &&
-       diff expect.index current.index
+       test_cmp expect.index current.index
 '
 
 test_expect_success "checkout -m with dirty tree, renamed" '
@@ -112,7 +136,7 @@ test_expect_success "checkout -m with dirty tree, renamed" '
 
        git checkout -m renamer &&
        fill 1 3 4 5 7 8 >expect &&
-       diff expect uno &&
+       test_cmp expect uno &&
        ! test -f one &&
        git diff --cached >current &&
        ! test -s current
@@ -137,7 +161,7 @@ test_expect_success 'checkout -m with merge conflict' '
        git diff master:one :3:uno |
        sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
        fill d2 aT d7 aS >expect &&
-       diff current expect &&
+       test_cmp current expect &&
        git diff --cached two >current &&
        ! test -s current
 '
@@ -145,7 +169,16 @@ test_expect_success 'checkout -m with merge conflict' '
 test_expect_success 'checkout to detach HEAD' '
 
        git checkout -f renamer && git clean -f &&
-       git checkout renamer^ &&
+       git checkout renamer^ 2>messages &&
+       (cat >messages.expect <<EOF
+Note: moving to "renamer^" which isn'"'"'t a local branch
+If you want to create a new branch from this checkout, you may do so
+(now or later) by using -b with the checkout command again. Example:
+  git checkout -b <new_branch_name>
+HEAD is now at 7329388... Initial A one, A two
+EOF
+) &&
+       test_cmp messages.expect messages &&
        H=$(git rev-parse --verify HEAD) &&
        M=$(git show-ref -s --verify refs/heads/master) &&
        test "z$H" = "z$M" &&
@@ -174,6 +207,22 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
        fi
 '
 
+test_expect_success 'checkout to detach HEAD with :/message' '
+
+       git checkout -f master && git clean -f &&
+       git checkout ":/Initial" &&
+       H=$(git rev-parse --verify HEAD) &&
+       M=$(git show-ref -s --verify refs/heads/master) &&
+       test "z$H" = "z$M" &&
+       if git symbolic-ref HEAD >/dev/null 2>&1
+       then
+               echo "OOPS, HEAD is still symbolic???"
+               false
+       else
+               : happy
+       fi
+'
+
 test_expect_success 'checkout to detach HEAD with HEAD^0' '
 
        git checkout -f master && git clean -f &&
@@ -230,4 +279,62 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
 
 '
 
+test_expect_success 'switch branches while in subdirectory' '
+
+       git reset --hard &&
+       git checkout master &&
+
+       mkdir subs &&
+       (
+               cd subs &&
+               git checkout side
+       ) &&
+       ! test -f subs/one &&
+       rm -fr subs
+
+'
+
+test_expect_success 'checkout specific path while in subdirectory' '
+
+       git reset --hard &&
+       git checkout side &&
+       mkdir subs &&
+       >subs/bero &&
+       git add subs/bero &&
+       git commit -m "add subs/bero" &&
+
+       git checkout master &&
+       mkdir -p subs &&
+       (
+               cd subs &&
+               git checkout side -- bero
+       ) &&
+       test -f subs/bero
+
+'
+
+test_expect_success \
+    'checkout w/--track sets up tracking' '
+    git config branch.autosetupmerge false &&
+    git checkout master &&
+    git checkout --track -b track1 &&
+    test "$(git config branch.track1.remote)" &&
+    test "$(git config branch.track1.merge)"'
+
+test_expect_success \
+    'checkout w/autosetupmerge=always sets up tracking' '
+    git config branch.autosetupmerge always &&
+    git checkout master &&
+    git checkout -b track2 &&
+    test "$(git config branch.track2.remote)" &&
+    test "$(git config branch.track2.merge)"
+    git config branch.autosetupmerge false'
+
+test_expect_success \
+    'checkout w/--track from non-branch HEAD fails' '
+    git checkout -b delete-me master &&
+    rm .git/refs/heads/delete-me &&
+    test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
+    !(git checkout --track -b track)'
+
 test_done