t / t3203-branch-output.shon commit Merge branch 'bh/diff-highlight-graph' into maint (276661f)
   1#!/bin/sh
   2
   3test_description='git branch display tests'
   4. ./test-lib.sh
   5
   6test_expect_success 'make commits' '
   7        echo content >file &&
   8        git add file &&
   9        git commit -m one &&
  10        echo content >>file &&
  11        git commit -a -m two
  12'
  13
  14test_expect_success 'make branches' '
  15        git branch branch-one &&
  16        git branch branch-two HEAD^
  17'
  18
  19test_expect_success 'make remote branches' '
  20        git update-ref refs/remotes/origin/branch-one branch-one &&
  21        git update-ref refs/remotes/origin/branch-two branch-two &&
  22        git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/branch-one
  23'
  24
  25cat >expect <<'EOF'
  26  branch-one
  27  branch-two
  28* master
  29EOF
  30test_expect_success 'git branch shows local branches' '
  31        git branch >actual &&
  32        test_cmp expect actual
  33'
  34
  35test_expect_success 'git branch --list shows local branches' '
  36        git branch --list >actual &&
  37        test_cmp expect actual
  38'
  39
  40cat >expect <<'EOF'
  41  branch-one
  42  branch-two
  43EOF
  44test_expect_success 'git branch --list pattern shows matching local branches' '
  45        git branch --list branch* >actual &&
  46        test_cmp expect actual
  47'
  48
  49cat >expect <<'EOF'
  50  origin/HEAD -> origin/branch-one
  51  origin/branch-one
  52  origin/branch-two
  53EOF
  54test_expect_success 'git branch -r shows remote branches' '
  55        git branch -r >actual &&
  56        test_cmp expect actual
  57'
  58
  59cat >expect <<'EOF'
  60  branch-one
  61  branch-two
  62* master
  63  remotes/origin/HEAD -> origin/branch-one
  64  remotes/origin/branch-one
  65  remotes/origin/branch-two
  66EOF
  67test_expect_success 'git branch -a shows local and remote branches' '
  68        git branch -a >actual &&
  69        test_cmp expect actual
  70'
  71
  72cat >expect <<'EOF'
  73two
  74one
  75two
  76EOF
  77test_expect_success 'git branch -v shows branch summaries' '
  78        git branch -v >tmp &&
  79        awk "{print \$NF}" <tmp >actual &&
  80        test_cmp expect actual
  81'
  82
  83cat >expect <<'EOF'
  84two
  85one
  86EOF
  87test_expect_success 'git branch --list -v pattern shows branch summaries' '
  88        git branch --list -v branch* >tmp &&
  89        awk "{print \$NF}" <tmp >actual &&
  90        test_cmp expect actual
  91'
  92
  93test_expect_success 'git branch -v pattern does not show branch summaries' '
  94        test_must_fail git branch -v branch*
  95'
  96
  97test_expect_success 'git branch shows detached HEAD properly' '
  98        cat >expect <<EOF &&
  99* (HEAD detached at $(git rev-parse --short HEAD^0))
 100  branch-one
 101  branch-two
 102  master
 103EOF
 104        git checkout HEAD^0 &&
 105        git branch >actual &&
 106        test_i18ncmp expect actual
 107'
 108
 109test_expect_success 'git branch shows detached HEAD properly after checkout --detach' '
 110        git checkout master &&
 111        cat >expect <<EOF &&
 112* (HEAD detached at $(git rev-parse --short HEAD^0))
 113  branch-one
 114  branch-two
 115  master
 116EOF
 117        git checkout --detach &&
 118        git branch >actual &&
 119        test_i18ncmp expect actual
 120'
 121
 122test_expect_success 'git branch shows detached HEAD properly after moving' '
 123        cat >expect <<EOF &&
 124* (HEAD detached from $(git rev-parse --short HEAD))
 125  branch-one
 126  branch-two
 127  master
 128EOF
 129        git reset --hard HEAD^1 &&
 130        git branch >actual &&
 131        test_i18ncmp expect actual
 132'
 133
 134test_expect_success 'git branch shows detached HEAD properly from tag' '
 135        cat >expect <<EOF &&
 136* (HEAD detached at fromtag)
 137  branch-one
 138  branch-two
 139  master
 140EOF
 141        git tag fromtag master &&
 142        git checkout fromtag &&
 143        git branch >actual &&
 144        test_i18ncmp expect actual
 145'
 146
 147test_expect_success 'git branch shows detached HEAD properly after moving from tag' '
 148        cat >expect <<EOF &&
 149* (HEAD detached from fromtag)
 150  branch-one
 151  branch-two
 152  master
 153EOF
 154        git reset --hard HEAD^1 &&
 155        git branch >actual &&
 156        test_i18ncmp expect actual
 157'
 158
 159test_expect_success 'git branch `--sort` option' '
 160        cat >expect <<-\EOF &&
 161        * (HEAD detached from fromtag)
 162          branch-two
 163          branch-one
 164          master
 165        EOF
 166        git branch --sort=objectsize >actual &&
 167        test_i18ncmp expect actual
 168'
 169
 170test_expect_success 'git branch --points-at option' '
 171        cat >expect <<-\EOF &&
 172          branch-one
 173          master
 174        EOF
 175        git branch --points-at=branch-one >actual &&
 176        test_cmp expect actual
 177'
 178
 179test_expect_success 'ambiguous branch/tag not marked' '
 180        git tag ambiguous &&
 181        git branch ambiguous &&
 182        echo "  ambiguous" >expect &&
 183        git branch --list ambiguous >actual &&
 184        test_cmp expect actual
 185'
 186
 187test_expect_success 'local-branch symrefs shortened properly' '
 188        git symbolic-ref refs/heads/ref-to-branch refs/heads/branch-one &&
 189        git symbolic-ref refs/heads/ref-to-remote refs/remotes/origin/branch-one &&
 190        cat >expect <<-\EOF &&
 191          ref-to-branch -> branch-one
 192          ref-to-remote -> refs/remotes/origin/branch-one
 193        EOF
 194        git branch >actual.raw &&
 195        grep ref-to <actual.raw >actual &&
 196        test_cmp expect actual
 197'
 198
 199test_done