t/t7201-co.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Junio C Hamano
   4 #
   5
   6 test_description='git-checkout tests.
   7
   8 Creates master, forks renamer and side branches from it.
   9 Test switching across them.
  10
  11   ! [master] Initial A one, A two
  12    * [renamer] Renamer R one->uno, M two
  13     ! [side] Side M one, D two, A three
  14   ---
  15     + [side] Side M one, D two, A three
  16    *  [renamer] Renamer R one->uno, M two
  17   +*+ [master] Initial A one, A two
  18
  19 '
  20
  21 . ./test-lib.sh
  22
  23 test_tick
  24
  25 fill () {
  26         for i
  27         do
  28                 echo "$i"
  29         done
  30 }
  31
  32
  33 test_expect_success setup '
  34
  35         fill x y z > same &&
  36         fill 1 2 3 4 5 6 7 8 >one &&
  37         fill a b c d e >two &&
  38         git add same one two &&
  39         git commit -m "Initial A one, A two" &&
  40
  41         git checkout -b renamer &&
  42         rm -f one &&
  43         fill 1 3 4 5 6 7 8 >uno &&
  44         git add uno &&
  45         fill a b c d e f >two &&
  46         git commit -a -m "Renamer R one->uno, M two" &&
  47
  48         git checkout -b side master &&
  49         fill 1 2 3 4 5 6 7 >one &&
  50         fill A B C D E >three &&
  51         rm -f two &&
  52         git update-index --add --remove one two three &&
  53         git commit -m "Side M one, D two, A three" &&
  54
  55         git checkout master
  56 '
  57
  58 test_expect_success "checkout from non-existing branch" '
  59
  60         git checkout -b delete-me master &&
  61         rm .git/refs/heads/delete-me &&
  62         test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
  63         git checkout master &&
  64         test refs/heads/master = "$(git symbolic-ref HEAD)"
  65 '
  66
  67 test_expect_success "checkout with dirty tree without -m" '
  68
  69         fill 0 1 2 3 4 5 6 7 8 >one &&
  70         if git checkout side
  71         then
  72                 echo Not happy
  73                 false
  74         else
  75                 echo "happy - failed correctly"
  76         fi
  77
  78 '
  79
  80 test_expect_success "checkout with unrelated dirty tree without -m" '
  81
  82         git checkout -f master &&
  83         fill 0 1 2 3 4 5 6 7 8 >same &&
  84         cp same kept
  85         git checkout side >messages &&
  86         test_cmp same kept
  87         (cat > messages.expect <<EOF
  88 M       same
  89 EOF
  90 ) &&
  91         touch messages.expect &&
  92         test_cmp messages.expect messages
  93 '
  94
  95 test_expect_success "checkout -m with dirty tree" '
  96
  97         git checkout -f master &&
  98         git clean -f &&
  99
 100         fill 0 1 2 3 4 5 6 7 8 >one &&
 101         git checkout -m side > messages &&
 102
 103         test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
 104
 105         (cat >expect.messages <<EOF
 106 M       one
 107 EOF
 108 ) &&
 109         test_cmp expect.messages messages &&
 110
 111         fill "M one" "A three" "D       two" >expect.master &&
 112         git diff --name-status master >current.master &&
 113         test_cmp expect.master current.master &&
 114
 115         fill "M one" >expect.side &&
 116         git diff --name-status side >current.side &&
 117         test_cmp expect.side current.side &&
 118
 119         : >expect.index &&
 120         git diff --cached >current.index &&
 121         test_cmp expect.index current.index
 122 '
 123
 124 test_expect_success "checkout -m with dirty tree, renamed" '
 125
 126         git checkout -f master && git clean -f &&
 127
 128         fill 1 2 3 4 5 7 8 >one &&
 129         if git checkout renamer
 130         then
 131                 echo Not happy
 132                 false
 133         else
 134                 echo "happy - failed correctly"
 135         fi &&
 136
 137         git checkout -m renamer &&
 138         fill 1 3 4 5 7 8 >expect &&
 139         test_cmp expect uno &&
 140         ! test -f one &&
 141         git diff --cached >current &&
 142         ! test -s current
 143
 144 '
 145
 146 test_expect_success 'checkout -m with merge conflict' '
 147
 148         git checkout -f master && git clean -f &&
 149
 150         fill 1 T 3 4 5 6 S 8 >one &&
 151         if git checkout renamer
 152         then
 153                 echo Not happy
 154                 false
 155         else
 156                 echo "happy - failed correctly"
 157         fi &&
 158
 159         git checkout -m renamer &&
 160
 161         git diff master:one :3:uno |
 162         sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
 163         fill d2 aT d7 aS >expect &&
 164         test_cmp current expect &&
 165         git diff --cached two >current &&
 166         ! test -s current
 167 '
 168
 169 test_expect_success 'checkout to detach HEAD' '
 170
 171         git checkout -f renamer && git clean -f &&
 172         git checkout renamer^ 2>messages &&
 173         (cat >messages.expect <<EOF
 174 Note: moving to "renamer^" which isn'"'"'t a local branch
 175 If you want to create a new branch from this checkout, you may do so
 176 (now or later) by using -b with the checkout command again. Example:
 177   git checkout -b <new_branch_name>
 178 HEAD is now at 7329388... Initial A one, A two
 179 EOF
 180 ) &&
 181         test_cmp messages.expect messages &&
 182         H=$(git rev-parse --verify HEAD) &&
 183         M=$(git show-ref -s --verify refs/heads/master) &&
 184         test "z$H" = "z$M" &&
 185         if git symbolic-ref HEAD >/dev/null 2>&1
 186         then
 187                 echo "OOPS, HEAD is still symbolic???"
 188                 false
 189         else
 190                 : happy
 191         fi
 192 '
 193
 194 test_expect_success 'checkout to detach HEAD with branchname^' '
 195
 196         git checkout -f master && git clean -f &&
 197         git checkout renamer^ &&
 198         H=$(git rev-parse --verify HEAD) &&
 199         M=$(git show-ref -s --verify refs/heads/master) &&
 200         test "z$H" = "z$M" &&
 201         if git symbolic-ref HEAD >/dev/null 2>&1
 202         then
 203                 echo "OOPS, HEAD is still symbolic???"
 204                 false
 205         else
 206                 : happy
 207         fi
 208 '
 209
 210 case $(uname -s) in
 211 *MINGW*) test_expect=test_expect_failure;;
 212 *)       test_expect=test_expect_success;;
 213 esac
 214 $test_expect 'checkout to detach HEAD with :/message' '
 215
 216         git checkout -f master && git clean -f &&
 217         git checkout ":/Initial" &&
 218         H=$(git rev-parse --verify HEAD) &&
 219         M=$(git show-ref -s --verify refs/heads/master) &&
 220         test "z$H" = "z$M" &&
 221         if git symbolic-ref HEAD >/dev/null 2>&1
 222         then
 223                 echo "OOPS, HEAD is still symbolic???"
 224                 false
 225         else
 226                 : happy
 227         fi
 228 '
 229
 230 test_expect_success 'checkout to detach HEAD with HEAD^0' '
 231
 232         git checkout -f master && git clean -f &&
 233         git checkout HEAD^0 &&
 234         H=$(git rev-parse --verify HEAD) &&
 235         M=$(git show-ref -s --verify refs/heads/master) &&
 236         test "z$H" = "z$M" &&
 237         if git symbolic-ref HEAD >/dev/null 2>&1
 238         then
 239                 echo "OOPS, HEAD is still symbolic???"
 240                 false
 241         else
 242                 : happy
 243         fi
 244 '
 245
 246 test_expect_success 'checkout with ambiguous tag/branch names' '
 247
 248         git tag both side &&
 249         git branch both master &&
 250         git reset --hard &&
 251         git checkout master &&
 252
 253         git checkout both &&
 254         H=$(git rev-parse --verify HEAD) &&
 255         M=$(git show-ref -s --verify refs/heads/master) &&
 256         test "z$H" = "z$M" &&
 257         name=$(git symbolic-ref HEAD 2>/dev/null) &&
 258         test "z$name" = zrefs/heads/both
 259
 260 '
 261
 262 test_expect_success 'checkout with ambiguous tag/branch names' '
 263
 264         git reset --hard &&
 265         git checkout master &&
 266
 267         git tag frotz side &&
 268         git branch frotz master &&
 269         git reset --hard &&
 270         git checkout master &&
 271
 272         git checkout tags/frotz &&
 273         H=$(git rev-parse --verify HEAD) &&
 274         S=$(git show-ref -s --verify refs/heads/side) &&
 275         test "z$H" = "z$S" &&
 276         if name=$(git symbolic-ref HEAD 2>/dev/null)
 277         then
 278                 echo "Bad -- should have detached"
 279                 false
 280         else
 281                 : happy
 282         fi
 283
 284 '
 285
 286 test_expect_success 'switch branches while in subdirectory' '
 287
 288         git reset --hard &&
 289         git checkout master &&
 290
 291         mkdir subs &&
 292         (
 293                 cd subs &&
 294                 git checkout side
 295         ) &&
 296         ! test -f subs/one &&
 297         rm -fr subs
 298
 299 '
 300
 301 test_expect_success 'checkout specific path while in subdirectory' '
 302
 303         git reset --hard &&
 304         git checkout side &&
 305         mkdir subs &&
 306         >subs/bero &&
 307         git add subs/bero &&
 308         git commit -m "add subs/bero" &&
 309
 310         git checkout master &&
 311         mkdir -p subs &&
 312         (
 313                 cd subs &&
 314                 git checkout side -- bero
 315         ) &&
 316         test -f subs/bero
 317
 318 '
 319
 320 test_expect_success \
 321     'checkout w/--track sets up tracking' '
 322     git config branch.autosetupmerge false &&
 323     git checkout master &&
 324     git checkout --track -b track1 &&
 325     test "$(git config branch.track1.remote)" &&
 326     test "$(git config branch.track1.merge)"'
 327
 328 test_expect_success \
 329     'checkout w/autosetupmerge=always sets up tracking' '
 330     git config branch.autosetupmerge always &&
 331     git checkout master &&
 332     git checkout -b track2 &&
 333     test "$(git config branch.track2.remote)" &&
 334     test "$(git config branch.track2.merge)"
 335     git config branch.autosetupmerge false'
 336
 337 test_expect_success \
 338     'checkout w/--track from non-branch HEAD fails' '
 339     git checkout -b delete-me master &&
 340     rm .git/refs/heads/delete-me &&
 341     test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
 342     !(git checkout --track -b track)'
 343
 344 test_done