t/t3200-branch.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2005 Amos Waterland
   4 #
   5
   6 test_description='git branch assorted tests'
   7
   8 . ./test-lib.sh
   9
  10 test_expect_success 'prepare a trivial repository' '
  11         echo Hello >A &&
  12         git update-index --add A &&
  13         git commit -m "Initial commit." &&
  14         echo World >>A &&
  15         git update-index --add A &&
  16         git commit -m "Second commit." &&
  17         HEAD=$(git rev-parse --verify HEAD)
  18 '
  19
  20 test_expect_success 'git branch --help should not have created a bogus branch' '
  21         test_might_fail git branch --man --help </dev/null >/dev/null 2>&1 &&
  22         test_path_is_missing .git/refs/heads/--help
  23 '
  24
  25 test_expect_success 'branch -h in broken repository' '
  26         mkdir broken &&
  27         (
  28                 cd broken &&
  29                 git init &&
  30                 >.git/refs/heads/master &&
  31                 test_expect_code 129 git branch -h >usage 2>&1
  32         ) &&
  33         test_i18ngrep "[Uu]sage" broken/usage
  34 '
  35
  36 test_expect_success 'git branch abc should create a branch' '
  37         git branch abc && test_path_is_file .git/refs/heads/abc
  38 '
  39
  40 test_expect_success 'git branch a/b/c should create a branch' '
  41         git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
  42 '
  43
  44 test_expect_success 'git branch HEAD should fail' '
  45         test_must_fail git branch HEAD
  46 '
  47
  48 cat >expect <<EOF
  49 $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
  50 EOF
  51 test_expect_success 'git branch -l d/e/f should create a branch and a log' '
  52         GIT_COMMITTER_DATE="2005-05-26 23:30" \
  53         git branch -l d/e/f &&
  54         test_path_is_file .git/refs/heads/d/e/f &&
  55         test_path_is_file .git/logs/refs/heads/d/e/f &&
  56         test_cmp expect .git/logs/refs/heads/d/e/f
  57 '
  58
  59 test_expect_success 'git branch -d d/e/f should delete a branch and a log' '
  60         git branch -d d/e/f &&
  61         test_path_is_missing .git/refs/heads/d/e/f &&
  62         test_path_is_missing .git/logs/refs/heads/d/e/f
  63 '
  64
  65 test_expect_success 'git branch j/k should work after branch j has been deleted' '
  66         git branch j &&
  67         git branch -d j &&
  68         git branch j/k
  69 '
  70
  71 test_expect_success 'git branch l should work after branch l/m has been deleted' '
  72         git branch l/m &&
  73         git branch -d l/m &&
  74         git branch l
  75 '
  76
  77 test_expect_success 'git branch -m dumps usage' '
  78         test_expect_code 128 git branch -m 2>err &&
  79         test_i18ngrep "branch name required" err
  80 '
  81
  82 test_expect_success 'git branch -m m m/m should work' '
  83         git branch -l m &&
  84         git branch -m m m/m &&
  85         test_path_is_file .git/logs/refs/heads/m/m
  86 '
  87
  88 test_expect_success 'git branch -m n/n n should work' '
  89         git branch -l n/n &&
  90         git branch -m n/n n &&
  91         test_path_is_file .git/logs/refs/heads/n
  92 '
  93
  94 test_expect_success 'git branch -m o/o o should fail when o/p exists' '
  95         git branch o/o &&
  96         git branch o/p &&
  97         test_must_fail git branch -m o/o o
  98 '
  99
 100 test_expect_success 'git branch -m q r/q should fail when r exists' '
 101         git branch q &&
 102         git branch r &&
 103         test_must_fail git branch -m q r/q
 104 '
 105
 106 test_expect_success 'git branch -M foo bar should fail when bar is checked out' '
 107         git branch bar &&
 108         git checkout -b foo &&
 109         test_must_fail git branch -M bar foo
 110 '
 111
 112 test_expect_success 'git branch -M baz bam should succeed when baz is checked out' '
 113         git checkout -b baz &&
 114         git branch bam &&
 115         git branch -M baz bam
 116 '
 117
 118 test_expect_success 'git branch -M master should work when master is checked out' '
 119         git checkout master &&
 120         git branch -M master
 121 '
 122
 123 test_expect_success 'git branch -M master master should work when master is checked out' '
 124         git checkout master &&
 125         git branch -M master master
 126 '
 127
 128 test_expect_success 'git branch -M master2 master2 should work when master is checked out' '
 129         git checkout master &&
 130         git branch master2 &&
 131         git branch -M master2 master2
 132 '
 133
 134 test_expect_success 'git branch -v -d t should work' '
 135         git branch t &&
 136         test_path_is_file .git/refs/heads/t &&
 137         git branch -v -d t &&
 138         test_path_is_missing .git/refs/heads/t
 139 '
 140
 141 test_expect_success 'git branch -v -m t s should work' '
 142         git branch t &&
 143         test_path_is_file .git/refs/heads/t &&
 144         git branch -v -m t s &&
 145         test_path_is_missing .git/refs/heads/t &&
 146         test_path_is_file .git/refs/heads/s &&
 147         git branch -d s
 148 '
 149
 150 test_expect_success 'git branch -m -d t s should fail' '
 151         git branch t &&
 152         test_path_is_file .git/refs/heads/t &&
 153         test_must_fail git branch -m -d t s &&
 154         git branch -d t &&
 155         test_path_is_missing .git/refs/heads/t
 156 '
 157
 158 test_expect_success 'git branch --list -d t should fail' '
 159         git branch t &&
 160         test_path_is_file .git/refs/heads/t &&
 161         test_must_fail git branch --list -d t &&
 162         git branch -d t &&
 163         test_path_is_missing .git/refs/heads/t
 164 '
 165
 166 test_expect_success 'git branch --column' '
 167         COLUMNS=81 git branch --column=column >actual &&
 168         cat >expected <<\EOF &&
 169   a/b/c     bam       foo       l       * master    n         o/p       r
 170   abc       bar       j/k       m/m       master2   o/o       q
 171 EOF
 172         test_cmp expected actual
 173 '
 174
 175 test_expect_success 'git branch --column with an extremely long branch name' '
 176         long=this/is/a/part/of/long/branch/name &&
 177         long=z$long/$long/$long/$long &&
 178         test_when_finished "git branch -d $long" &&
 179         git branch $long &&
 180         COLUMNS=80 git branch --column=column >actual &&
 181         cat >expected <<EOF &&
 182   a/b/c
 183   abc
 184   bam
 185   bar
 186   foo
 187   j/k
 188   l
 189   m/m
 190 * master
 191   master2
 192   n
 193   o/o
 194   o/p
 195   q
 196   r
 197   $long
 198 EOF
 199         test_cmp expected actual
 200 '
 201
 202 test_expect_success 'git branch with column.*' '
 203         git config column.ui column &&
 204         git config column.branch "dense" &&
 205         COLUMNS=80 git branch >actual &&
 206         git config --unset column.branch &&
 207         git config --unset column.ui &&
 208         cat >expected <<\EOF &&
 209   a/b/c   bam   foo   l   * master    n     o/p   r
 210   abc     bar   j/k   m/m   master2   o/o   q
 211 EOF
 212         test_cmp expected actual
 213 '
 214
 215 test_expect_success 'git branch --column -v should fail' '
 216         test_must_fail git branch --column -v
 217 '
 218
 219 test_expect_success 'git branch -v with column.ui ignored' '
 220         git config column.ui column &&
 221         COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual &&
 222         git config --unset column.ui &&
 223         cat >expected <<\EOF &&
 224   a/b/c
 225   abc
 226   bam
 227   bar
 228   foo
 229   j/k
 230   l
 231   m/m
 232 * master
 233   master2
 234   n
 235   o/o
 236   o/p
 237   q
 238   r
 239 EOF
 240         test_cmp expected actual
 241 '
 242
 243 mv .git/config .git/config-saved
 244
 245 test_expect_success 'git branch -m q q2 without config should succeed' '
 246         git branch -m q q2 &&
 247         git branch -m q2 q
 248 '
 249
 250 mv .git/config-saved .git/config
 251
 252 git config branch.s/s.dummy Hello
 253
 254 test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
 255         git branch -l s/s &&
 256         test_path_is_file .git/logs/refs/heads/s/s &&
 257         git branch -l s/t &&
 258         test_path_is_file .git/logs/refs/heads/s/t &&
 259         git branch -d s/t &&
 260         git branch -m s/s s &&
 261         test_path_is_file .git/logs/refs/heads/s
 262 '
 263
 264 test_expect_success 'config information was renamed, too' '
 265         test $(git config branch.s.dummy) = Hello &&
 266         test_must_fail git config branch.s/s/dummy
 267 '
 268
 269 test_expect_success 'deleting a symref' '
 270         git branch target &&
 271         git symbolic-ref refs/heads/symref refs/heads/target &&
 272         echo "Deleted branch symref (was refs/heads/target)." >expect &&
 273         git branch -d symref >actual &&
 274         test_path_is_file .git/refs/heads/target &&
 275         test_path_is_missing .git/refs/heads/symref &&
 276         test_i18ncmp expect actual
 277 '
 278
 279 test_expect_success 'deleting a dangling symref' '
 280         git symbolic-ref refs/heads/dangling-symref nowhere &&
 281         test_path_is_file .git/refs/heads/dangling-symref &&
 282         echo "Deleted branch dangling-symref (was nowhere)." >expect &&
 283         git branch -d dangling-symref >actual &&
 284         test_path_is_missing .git/refs/heads/dangling-symref &&
 285         test_i18ncmp expect actual
 286 '
 287
 288 test_expect_success 'deleting a self-referential symref' '
 289         git symbolic-ref refs/heads/self-reference refs/heads/self-reference &&
 290         test_path_is_file .git/refs/heads/self-reference &&
 291         echo "Deleted branch self-reference (was refs/heads/self-reference)." >expect &&
 292         git branch -d self-reference >actual &&
 293         test_path_is_missing .git/refs/heads/self-reference &&
 294         test_i18ncmp expect actual
 295 '
 296
 297 test_expect_success 'renaming a symref is not allowed' '
 298         git symbolic-ref refs/heads/master2 refs/heads/master &&
 299         test_must_fail git branch -m master2 master3 &&
 300         git symbolic-ref refs/heads/master2 &&
 301         test_path_is_file .git/refs/heads/master &&
 302         test_path_is_missing .git/refs/heads/master3
 303 '
 304
 305 test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '
 306         git branch -l u &&
 307         mv .git/logs/refs/heads/u real-u &&
 308         ln -s real-u .git/logs/refs/heads/u &&
 309         test_must_fail git branch -m u v
 310 '
 311
 312 test_expect_success 'test tracking setup via --track' '
 313         git config remote.local.url . &&
 314         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 315         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 316         git branch --track my1 local/master &&
 317         test $(git config branch.my1.remote) = local &&
 318         test $(git config branch.my1.merge) = refs/heads/master
 319 '
 320
 321 test_expect_success 'test tracking setup (non-wildcard, matching)' '
 322         git config remote.local.url . &&
 323         git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
 324         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 325         git branch --track my4 local/master &&
 326         test $(git config branch.my4.remote) = local &&
 327         test $(git config branch.my4.merge) = refs/heads/master
 328 '
 329
 330 test_expect_success 'tracking setup fails on non-matching refspec' '
 331         git config remote.local.url . &&
 332         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 333         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 334         git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
 335         test_must_fail git branch --track my5 local/master &&
 336         test_must_fail git config branch.my5.remote &&
 337         test_must_fail git config branch.my5.merge
 338 '
 339
 340 test_expect_success 'test tracking setup via config' '
 341         git config branch.autosetupmerge true &&
 342         git config remote.local.url . &&
 343         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 344         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 345         git branch my3 local/master &&
 346         test $(git config branch.my3.remote) = local &&
 347         test $(git config branch.my3.merge) = refs/heads/master
 348 '
 349
 350 test_expect_success 'test overriding tracking setup via --no-track' '
 351         git config branch.autosetupmerge true &&
 352         git config remote.local.url . &&
 353         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 354         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 355         git branch --no-track my2 local/master &&
 356         git config branch.autosetupmerge false &&
 357         ! test "$(git config branch.my2.remote)" = local &&
 358         ! test "$(git config branch.my2.merge)" = refs/heads/master
 359 '
 360
 361 test_expect_success 'no tracking without .fetch entries' '
 362         git config branch.autosetupmerge true &&
 363         git branch my6 s &&
 364         git config branch.autosetupmerge false &&
 365         test -z "$(git config branch.my6.remote)" &&
 366         test -z "$(git config branch.my6.merge)"
 367 '
 368
 369 test_expect_success 'test tracking setup via --track but deeper' '
 370         git config remote.local.url . &&
 371         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 372         (git show-ref -q refs/remotes/local/o/o || git fetch local) &&
 373         git branch --track my7 local/o/o &&
 374         test "$(git config branch.my7.remote)" = local &&
 375         test "$(git config branch.my7.merge)" = refs/heads/o/o
 376 '
 377
 378 test_expect_success 'test deleting branch deletes branch config' '
 379         git branch -d my7 &&
 380         test -z "$(git config branch.my7.remote)" &&
 381         test -z "$(git config branch.my7.merge)"
 382 '
 383
 384 test_expect_success 'test deleting branch without config' '
 385         git branch my7 s &&
 386         sha1=$(git rev-parse my7 | cut -c 1-7) &&
 387         echo "Deleted branch my7 (was $sha1)." >expect &&
 388         git branch -d my7 >actual 2>&1 &&
 389         test_i18ncmp expect actual
 390 '
 391
 392 test_expect_success 'test --track without .fetch entries' '
 393         git branch --track my8 &&
 394         test "$(git config branch.my8.remote)" &&
 395         test "$(git config branch.my8.merge)"
 396 '
 397
 398 test_expect_success 'branch from non-branch HEAD w/autosetupmerge=always' '
 399         git config branch.autosetupmerge always &&
 400         git branch my9 HEAD^ &&
 401         git config branch.autosetupmerge false
 402 '
 403
 404 test_expect_success 'branch from non-branch HEAD w/--track causes failure' '
 405         test_must_fail git branch --track my10 HEAD^
 406 '
 407
 408 test_expect_success 'branch from tag w/--track causes failure' '
 409         git tag foobar &&
 410         test_must_fail git branch --track my11 foobar
 411 '
 412
 413 test_expect_success '--set-upstream-to fails on multiple branches' '
 414         test_must_fail git branch --set-upstream-to master a b c
 415 '
 416
 417 test_expect_success '--set-upstream-to fails on detached HEAD' '
 418         git checkout HEAD^{} &&
 419         test_must_fail git branch --set-upstream-to master &&
 420         git checkout -
 421 '
 422
 423 test_expect_success '--set-upstream-to fails on a missing dst branch' '
 424         test_must_fail git branch --set-upstream-to master does-not-exist
 425 '
 426
 427 test_expect_success '--set-upstream-to fails on a missing src branch' '
 428         test_must_fail git branch --set-upstream-to does-not-exist master
 429 '
 430
 431 test_expect_success '--set-upstream-to fails on a non-ref' '
 432         test_must_fail git branch --set-upstream-to HEAD^{}
 433 '
 434
 435 test_expect_success 'use --set-upstream-to modify HEAD' '
 436         test_config branch.master.remote foo &&
 437         test_config branch.master.merge foo &&
 438         git branch my12 &&
 439         git branch --set-upstream-to my12 &&
 440         test "$(git config branch.master.remote)" = "." &&
 441         test "$(git config branch.master.merge)" = "refs/heads/my12"
 442 '
 443
 444 test_expect_success 'use --set-upstream-to modify a particular branch' '
 445         git branch my13 &&
 446         git branch --set-upstream-to master my13 &&
 447         test "$(git config branch.my13.remote)" = "." &&
 448         test "$(git config branch.my13.merge)" = "refs/heads/master"
 449 '
 450
 451 test_expect_success '--unset-upstream should fail if given a non-existent branch' '
 452         test_must_fail git branch --unset-upstream i-dont-exist
 453 '
 454
 455 test_expect_success 'test --unset-upstream on HEAD' '
 456         git branch my14 &&
 457         test_config branch.master.remote foo &&
 458         test_config branch.master.merge foo &&
 459         git branch --set-upstream-to my14 &&
 460         git branch --unset-upstream &&
 461         test_must_fail git config branch.master.remote &&
 462         test_must_fail git config branch.master.merge &&
 463         # fail for a branch without upstream set
 464         test_must_fail git branch --unset-upstream
 465 '
 466
 467 test_expect_success '--unset-upstream should fail on multiple branches' '
 468         test_must_fail git branch --unset-upstream a b c
 469 '
 470
 471 test_expect_success '--unset-upstream should fail on detached HEAD' '
 472         git checkout HEAD^{} &&
 473         test_must_fail git branch --unset-upstream &&
 474         git checkout -
 475 '
 476
 477 test_expect_success 'test --unset-upstream on a particular branch' '
 478         git branch my15 &&
 479         git branch --set-upstream-to master my14 &&
 480         git branch --unset-upstream my14 &&
 481         test_must_fail git config branch.my14.remote &&
 482         test_must_fail git config branch.my14.merge
 483 '
 484
 485 test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' '
 486         git update-ref refs/remotes/origin/master HEAD &&
 487         git branch --set-upstream origin/master 2>actual &&
 488         test_when_finished git update-ref -d refs/remotes/origin/master &&
 489         test_when_finished git branch -d origin/master &&
 490         cat >expected <<EOF &&
 491 The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
 492
 493 If you wanted to make '"'master'"' track '"'origin/master'"', do this:
 494
 495     git branch -d origin/master
 496     git branch --set-upstream-to origin/master
 497 EOF
 498         test_cmp expected actual
 499 '
 500
 501 test_expect_success '--set-upstream with two args only shows the deprecation message' '
 502         git branch --set-upstream master my13 2>actual &&
 503         test_when_finished git branch --unset-upstream master &&
 504         cat >expected <<EOF &&
 505 The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
 506 EOF
 507         test_cmp expected actual
 508 '
 509
 510 test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '
 511         git branch --set-upstream my13 2>actual &&
 512         test_when_finished git branch --unset-upstream my13 &&
 513         cat >expected <<EOF &&
 514 The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
 515 EOF
 516         test_cmp expected actual
 517 '
 518
 519 test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
 520         git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
 521         cat >expected <<-\EOF &&
 522         warning: Not setting branch my13 as its own upstream.
 523         EOF
 524         test_expect_code 1 git config branch.my13.remote &&
 525         test_expect_code 1 git config branch.my13.merge &&
 526         test_i18ncmp expected actual
 527 '
 528
 529 # Keep this test last, as it changes the current branch
 530 cat >expect <<EOF
 531 $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
 532 EOF
 533 test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' '
 534         GIT_COMMITTER_DATE="2005-05-26 23:30" \
 535         git checkout -b g/h/i -l master &&
 536         test_path_is_file .git/refs/heads/g/h/i &&
 537         test_path_is_file .git/logs/refs/heads/g/h/i &&
 538         test_cmp expect .git/logs/refs/heads/g/h/i
 539 '
 540
 541 test_expect_success 'checkout -b makes reflog by default' '
 542         git checkout master &&
 543         git config --unset core.logAllRefUpdates &&
 544         git checkout -b alpha &&
 545         git rev-parse --verify alpha@{0}
 546 '
 547
 548 test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' '
 549         git checkout master &&
 550         git config core.logAllRefUpdates false &&
 551         git checkout -b beta &&
 552         test_must_fail git rev-parse --verify beta@{0}
 553 '
 554
 555 test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
 556         git checkout master &&
 557         git checkout -lb gamma &&
 558         git config --unset core.logAllRefUpdates &&
 559         git rev-parse --verify gamma@{0}
 560 '
 561
 562 test_expect_success 'avoid ambiguous track' '
 563         git config branch.autosetupmerge true &&
 564         git config remote.ambi1.url lalala &&
 565         git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
 566         git config remote.ambi2.url lilili &&
 567         git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
 568         git branch all1 master &&
 569         test -z "$(git config branch.all1.merge)"
 570 '
 571
 572 test_expect_success 'autosetuprebase local on a tracked local branch' '
 573         git config remote.local.url . &&
 574         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 575         git config branch.autosetuprebase local &&
 576         (git show-ref -q refs/remotes/local/o || git fetch local) &&
 577         git branch mybase &&
 578         git branch --track myr1 mybase &&
 579         test "$(git config branch.myr1.remote)" = . &&
 580         test "$(git config branch.myr1.merge)" = refs/heads/mybase &&
 581         test "$(git config branch.myr1.rebase)" = true
 582 '
 583
 584 test_expect_success 'autosetuprebase always on a tracked local branch' '
 585         git config remote.local.url . &&
 586         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 587         git config branch.autosetuprebase always &&
 588         (git show-ref -q refs/remotes/local/o || git fetch local) &&
 589         git branch mybase2 &&
 590         git branch --track myr2 mybase &&
 591         test "$(git config branch.myr2.remote)" = . &&
 592         test "$(git config branch.myr2.merge)" = refs/heads/mybase &&
 593         test "$(git config branch.myr2.rebase)" = true
 594 '
 595
 596 test_expect_success 'autosetuprebase remote on a tracked local branch' '
 597         git config remote.local.url . &&
 598         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 599         git config branch.autosetuprebase remote &&
 600         (git show-ref -q refs/remotes/local/o || git fetch local) &&
 601         git branch mybase3 &&
 602         git branch --track myr3 mybase2 &&
 603         test "$(git config branch.myr3.remote)" = . &&
 604         test "$(git config branch.myr3.merge)" = refs/heads/mybase2 &&
 605         ! test "$(git config branch.myr3.rebase)" = true
 606 '
 607
 608 test_expect_success 'autosetuprebase never on a tracked local branch' '
 609         git config remote.local.url . &&
 610         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 611         git config branch.autosetuprebase never &&
 612         (git show-ref -q refs/remotes/local/o || git fetch local) &&
 613         git branch mybase4 &&
 614         git branch --track myr4 mybase2 &&
 615         test "$(git config branch.myr4.remote)" = . &&
 616         test "$(git config branch.myr4.merge)" = refs/heads/mybase2 &&
 617         ! test "$(git config branch.myr4.rebase)" = true
 618 '
 619
 620 test_expect_success 'autosetuprebase local on a tracked remote branch' '
 621         git config remote.local.url . &&
 622         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 623         git config branch.autosetuprebase local &&
 624         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 625         git branch --track myr5 local/master &&
 626         test "$(git config branch.myr5.remote)" = local &&
 627         test "$(git config branch.myr5.merge)" = refs/heads/master &&
 628         ! test "$(git config branch.myr5.rebase)" = true
 629 '
 630
 631 test_expect_success 'autosetuprebase never on a tracked remote branch' '
 632         git config remote.local.url . &&
 633         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 634         git config branch.autosetuprebase never &&
 635         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 636         git branch --track myr6 local/master &&
 637         test "$(git config branch.myr6.remote)" = local &&
 638         test "$(git config branch.myr6.merge)" = refs/heads/master &&
 639         ! test "$(git config branch.myr6.rebase)" = true
 640 '
 641
 642 test_expect_success 'autosetuprebase remote on a tracked remote branch' '
 643         git config remote.local.url . &&
 644         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 645         git config branch.autosetuprebase remote &&
 646         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 647         git branch --track myr7 local/master &&
 648         test "$(git config branch.myr7.remote)" = local &&
 649         test "$(git config branch.myr7.merge)" = refs/heads/master &&
 650         test "$(git config branch.myr7.rebase)" = true
 651 '
 652
 653 test_expect_success 'autosetuprebase always on a tracked remote branch' '
 654         git config remote.local.url . &&
 655         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 656         git config branch.autosetuprebase remote &&
 657         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 658         git branch --track myr8 local/master &&
 659         test "$(git config branch.myr8.remote)" = local &&
 660         test "$(git config branch.myr8.merge)" = refs/heads/master &&
 661         test "$(git config branch.myr8.rebase)" = true
 662 '
 663
 664 test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '
 665         git config --unset branch.autosetuprebase &&
 666         git config remote.local.url . &&
 667         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 668         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 669         git branch --track myr9 local/master &&
 670         test "$(git config branch.myr9.remote)" = local &&
 671         test "$(git config branch.myr9.merge)" = refs/heads/master &&
 672         test "z$(git config branch.myr9.rebase)" = z
 673 '
 674
 675 test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '
 676         git config remote.local.url . &&
 677         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 678         (git show-ref -q refs/remotes/local/o || git fetch local) &&
 679         git branch mybase10 &&
 680         git branch --track myr10 mybase2 &&
 681         test "$(git config branch.myr10.remote)" = . &&
 682         test "$(git config branch.myr10.merge)" = refs/heads/mybase2 &&
 683         test "z$(git config branch.myr10.rebase)" = z
 684 '
 685
 686 test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
 687         git config remote.local.url . &&
 688         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 689         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 690         git branch --no-track myr11 mybase2 &&
 691         test "z$(git config branch.myr11.remote)" = z &&
 692         test "z$(git config branch.myr11.merge)" = z &&
 693         test "z$(git config branch.myr11.rebase)" = z
 694 '
 695
 696 test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '
 697         git config remote.local.url . &&
 698         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 699         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 700         git branch --no-track myr12 local/master &&
 701         test "z$(git config branch.myr12.remote)" = z &&
 702         test "z$(git config branch.myr12.merge)" = z &&
 703         test "z$(git config branch.myr12.rebase)" = z
 704 '
 705
 706 test_expect_success 'autosetuprebase never on an untracked local branch' '
 707         git config branch.autosetuprebase never &&
 708         git config remote.local.url . &&
 709         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 710         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 711         git branch --no-track myr13 mybase2 &&
 712         test "z$(git config branch.myr13.remote)" = z &&
 713         test "z$(git config branch.myr13.merge)" = z &&
 714         test "z$(git config branch.myr13.rebase)" = z
 715 '
 716
 717 test_expect_success 'autosetuprebase local on an untracked local branch' '
 718         git config branch.autosetuprebase local &&
 719         git config remote.local.url . &&
 720         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 721         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 722         git branch --no-track myr14 mybase2 &&
 723         test "z$(git config branch.myr14.remote)" = z &&
 724         test "z$(git config branch.myr14.merge)" = z &&
 725         test "z$(git config branch.myr14.rebase)" = z
 726 '
 727
 728 test_expect_success 'autosetuprebase remote on an untracked local branch' '
 729         git config branch.autosetuprebase remote &&
 730         git config remote.local.url . &&
 731         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 732         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 733         git branch --no-track myr15 mybase2 &&
 734         test "z$(git config branch.myr15.remote)" = z &&
 735         test "z$(git config branch.myr15.merge)" = z &&
 736         test "z$(git config branch.myr15.rebase)" = z
 737 '
 738
 739 test_expect_success 'autosetuprebase always on an untracked local branch' '
 740         git config branch.autosetuprebase always &&
 741         git config remote.local.url . &&
 742         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 743         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 744         git branch --no-track myr16 mybase2 &&
 745         test "z$(git config branch.myr16.remote)" = z &&
 746         test "z$(git config branch.myr16.merge)" = z &&
 747         test "z$(git config branch.myr16.rebase)" = z
 748 '
 749
 750 test_expect_success 'autosetuprebase never on an untracked remote branch' '
 751         git config branch.autosetuprebase never &&
 752         git config remote.local.url . &&
 753         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 754         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 755         git branch --no-track myr17 local/master &&
 756         test "z$(git config branch.myr17.remote)" = z &&
 757         test "z$(git config branch.myr17.merge)" = z &&
 758         test "z$(git config branch.myr17.rebase)" = z
 759 '
 760
 761 test_expect_success 'autosetuprebase local on an untracked remote branch' '
 762         git config branch.autosetuprebase local &&
 763         git config remote.local.url . &&
 764         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 765         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 766         git branch --no-track myr18 local/master &&
 767         test "z$(git config branch.myr18.remote)" = z &&
 768         test "z$(git config branch.myr18.merge)" = z &&
 769         test "z$(git config branch.myr18.rebase)" = z
 770 '
 771
 772 test_expect_success 'autosetuprebase remote on an untracked remote branch' '
 773         git config branch.autosetuprebase remote &&
 774         git config remote.local.url . &&
 775         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 776         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 777         git branch --no-track myr19 local/master &&
 778         test "z$(git config branch.myr19.remote)" = z &&
 779         test "z$(git config branch.myr19.merge)" = z &&
 780         test "z$(git config branch.myr19.rebase)" = z
 781 '
 782
 783 test_expect_success 'autosetuprebase always on an untracked remote branch' '
 784         git config branch.autosetuprebase always &&
 785         git config remote.local.url . &&
 786         git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 787         (git show-ref -q refs/remotes/local/master || git fetch local) &&
 788         git branch --no-track myr20 local/master &&
 789         test "z$(git config branch.myr20.remote)" = z &&
 790         test "z$(git config branch.myr20.merge)" = z &&
 791         test "z$(git config branch.myr20.rebase)" = z
 792 '
 793
 794 test_expect_success 'autosetuprebase always on detached HEAD' '
 795         git config branch.autosetupmerge always &&
 796         test_when_finished git checkout master &&
 797         git checkout HEAD^0 &&
 798         git branch my11 &&
 799         test -z "$(git config branch.my11.remote)" &&
 800         test -z "$(git config branch.my11.merge)"
 801 '
 802
 803 test_expect_success 'detect misconfigured autosetuprebase (bad value)' '
 804         git config branch.autosetuprebase garbage &&
 805         test_must_fail git branch
 806 '
 807
 808 test_expect_success 'detect misconfigured autosetuprebase (no value)' '
 809         git config --unset branch.autosetuprebase &&
 810         echo "[branch] autosetuprebase" >>.git/config &&
 811         test_must_fail git branch &&
 812         git config --unset branch.autosetuprebase
 813 '
 814
 815 test_expect_success 'attempt to delete a branch without base and unmerged to HEAD' '
 816         git checkout my9 &&
 817         git config --unset branch.my8.merge &&
 818         test_must_fail git branch -d my8
 819 '
 820
 821 test_expect_success 'attempt to delete a branch merged to its base' '
 822         # we are on my9 which is the initial commit; traditionally
 823         # we would not have allowed deleting my8 that is not merged
 824         # to my9, but it is set to track master that already has my8
 825         git config branch.my8.merge refs/heads/master &&
 826         git branch -d my8
 827 '
 828
 829 test_expect_success 'attempt to delete a branch merged to its base' '
 830         git checkout master &&
 831         echo Third >>A &&
 832         git commit -m "Third commit" A &&
 833         git branch -t my10 my9 &&
 834         git branch -f my10 HEAD^ &&
 835         # we are on master which is at the third commit, and my10
 836         # is behind us, so traditionally we would have allowed deleting
 837         # it; but my10 is set to track my9 that is further behind.
 838         test_must_fail git branch -d my10
 839 '
 840
 841 test_expect_success 'use set-upstream on the current branch' '
 842         git checkout master &&
 843         git --bare init myupstream.git &&
 844         git push myupstream.git master:refs/heads/frotz &&
 845         git remote add origin myupstream.git &&
 846         git fetch &&
 847         git branch --set-upstream master origin/frotz &&
 848
 849         test "z$(git config branch.master.remote)" = "zorigin" &&
 850         test "z$(git config branch.master.merge)" = "zrefs/heads/frotz"
 851
 852 '
 853
 854 test_expect_success 'use --edit-description' '
 855         write_script editor <<-\EOF &&
 856                 echo "New contents" >"$1"
 857         EOF
 858         EDITOR=./editor git branch --edit-description &&
 859                 write_script editor <<-\EOF &&
 860                 git stripspace -s <"$1" >"EDITOR_OUTPUT"
 861         EOF
 862         EDITOR=./editor git branch --edit-description &&
 863         echo "New contents" >expect &&
 864         test_cmp EDITOR_OUTPUT expect
 865 '
 866
 867 test_expect_success 'detect typo in branch name when using --edit-description' '
 868         write_script editor <<-\EOF &&
 869                 echo "New contents" >"$1"
 870         EOF
 871         test_must_fail env EDITOR=./editor git branch --edit-description no-such-branch
 872 '
 873
 874 test_expect_success 'refuse --edit-description on unborn branch for now' '
 875         write_script editor <<-\EOF &&
 876                 echo "New contents" >"$1"
 877         EOF
 878         git checkout --orphan unborn &&
 879         test_must_fail env EDITOR=./editor git branch --edit-description
 880 '
 881
 882 test_expect_success '--merged catches invalid object names' '
 883         test_must_fail git branch --merged 0000000000000000000000000000000000000000
 884 '
 885
 886 test_expect_success 'tracking with unexpected .fetch refspec' '
 887         rm -rf a b c d &&
 888         git init a &&
 889         (
 890                 cd a &&
 891                 test_commit a
 892         ) &&
 893         git init b &&
 894         (
 895                 cd b &&
 896                 test_commit b
 897         ) &&
 898         git init c &&
 899         (
 900                 cd c &&
 901                 test_commit c &&
 902                 git remote add a ../a &&
 903                 git remote add b ../b &&
 904                 git fetch --all
 905         ) &&
 906         git init d &&
 907         (
 908                 cd d &&
 909                 git remote add c ../c &&
 910                 git config remote.c.fetch "+refs/remotes/*:refs/remotes/*" &&
 911                 git fetch c &&
 912                 git branch --track local/a/master remotes/a/master &&
 913                 test "$(git config branch.local/a/master.remote)" = "c" &&
 914                 test "$(git config branch.local/a/master.merge)" = "refs/remotes/a/master" &&
 915                 git rev-parse --verify a >expect &&
 916                 git rev-parse --verify local/a/master >actual &&
 917                 test_cmp expect actual
 918         )
 919 '
 920
 921 test_done