Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2012 Zbigniew Jędrzejewski-Szmek |
| 4 | # |
| 5 | |
| 6 | test_description='test --stat output of various commands' |
| 7 | |
| 8 | . ./test-lib.sh |
| 9 | . "$TEST_DIRECTORY"/lib-terminal.sh |
| 10 | |
| 11 | # 120 character name |
| 12 | name=aaaaaaaaaa |
| 13 | name=$name$name$name$name$name$name$name$name$name$name$name$name |
| 14 | test_expect_success 'preparation' ' |
| 15 | >"$name" && |
| 16 | git add "$name" && |
| 17 | git commit -m message && |
| 18 | echo a >"$name" && |
| 19 | git commit -m message "$name" |
| 20 | ' |
| 21 | |
| 22 | while read cmd args |
| 23 | do |
| 24 | cat >expect <<-'EOF' |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 25 | ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 + |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 26 | EOF |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 27 | test_expect_success "$cmd: small change with long name gives more space to the name" ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 28 | git $cmd $args >output && |
| 29 | grep " | " output >actual && |
| 30 | test_cmp expect actual |
| 31 | ' |
| 32 | |
| 33 | cat >expect <<-'EOF' |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 34 | ...aaaaaaaaaaaaaaaaaaaaaaaaaa | 1 + |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 35 | EOF |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 36 | test_expect_success "$cmd --stat=width: a long name is given more room when the bar is short" ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 37 | git $cmd $args --stat=40 >output && |
| 38 | grep " | " output >actual && |
| 39 | test_cmp expect actual |
| 40 | ' |
| 41 | |
| 42 | test_expect_success "$cmd --stat-width=width with long name" ' |
| 43 | git $cmd $args --stat-width=40 >output && |
| 44 | grep " | " output >actual && |
| 45 | test_cmp expect actual |
| 46 | ' |
| 47 | |
| 48 | cat >expect <<-'EOF' |
| 49 | ...aaaaaaaaaaaaaaaaaaaaaaaaaaa | 1 + |
| 50 | EOF |
| 51 | test_expect_success "$cmd --stat=...,name-width with long name" ' |
| 52 | git $cmd $args --stat=60,30 >output && |
| 53 | grep " | " output >actual && |
| 54 | test_cmp expect actual |
| 55 | ' |
| 56 | |
| 57 | test_expect_success "$cmd --stat-name-width with long name" ' |
| 58 | git $cmd $args --stat-name-width=30 >output && |
| 59 | grep " | " output >actual && |
| 60 | test_cmp expect actual |
| 61 | ' |
| 62 | done <<\EOF |
| 63 | format-patch -1 --stdout |
| 64 | diff HEAD^ HEAD --stat |
| 65 | show --stat |
| 66 | log -1 --stat |
| 67 | EOF |
| 68 | |
| 69 | |
| 70 | test_expect_success 'preparation for big change tests' ' |
| 71 | >abcd && |
| 72 | git add abcd && |
| 73 | git commit -m message && |
| 74 | i=0 && |
| 75 | while test $i -lt 1000 |
| 76 | do |
| 77 | echo $i && i=$(($i + 1)) |
| 78 | done >abcd && |
| 79 | git commit -m message abcd |
| 80 | ' |
| 81 | |
| 82 | cat >expect80 <<'EOF' |
| 83 | abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 84 | EOF |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 85 | cat >expect80-graph <<'EOF' |
| 86 | | abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 87 | EOF |
Zbigniew Jędrzejewski-Szmek | af9fedc | 2012-03-01 13:26:39 +0100 | [diff] [blame] | 88 | cat >expect200 <<'EOF' |
| 89 | abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 90 | EOF |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 91 | cat >expect200-graph <<'EOF' |
Lucian Poston | 36dcc02 | 2012-04-16 03:44:52 -0700 | [diff] [blame] | 92 | | abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 93 | EOF |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 94 | while read verb expect cmd args |
| 95 | do |
| 96 | test_expect_success "$cmd $verb COLUMNS (big change)" ' |
| 97 | COLUMNS=200 git $cmd $args >output |
| 98 | grep " | " output >actual && |
| 99 | test_cmp "$expect" actual |
| 100 | ' |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 101 | |
| 102 | test "$cmd" != diff || continue |
| 103 | |
| 104 | test_expect_success "$cmd --graph $verb COLUMNS (big change)" ' |
| 105 | COLUMNS=200 git $cmd $args --graph >output |
| 106 | grep " | " output >actual && |
| 107 | test_cmp "$expect-graph" actual |
| 108 | ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 109 | done <<\EOF |
| 110 | ignores expect80 format-patch -1 --stdout |
Zbigniew Jędrzejewski-Szmek | af9fedc | 2012-03-01 13:26:39 +0100 | [diff] [blame] | 111 | respects expect200 diff HEAD^ HEAD --stat |
Zbigniew Jędrzejewski-Szmek | 666c92a | 2012-03-01 13:26:40 +0100 | [diff] [blame] | 112 | respects expect200 show --stat |
Zbigniew Jędrzejewski-Szmek | 5e0ec15 | 2012-03-01 13:26:41 +0100 | [diff] [blame] | 113 | respects expect200 log -1 --stat |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 114 | EOF |
| 115 | |
Zbigniew Jędrzejewski-Szmek | c4432d5 | 2012-03-01 13:26:44 +0100 | [diff] [blame] | 116 | cat >expect40 <<'EOF' |
| 117 | abcd | 1000 ++++++++++++++++++++++++++ |
| 118 | EOF |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 119 | cat >expect40-graph <<'EOF' |
Lucian Poston | 36dcc02 | 2012-04-16 03:44:52 -0700 | [diff] [blame] | 120 | | abcd | 1000 ++++++++++++++++++++++++ |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 121 | EOF |
Zbigniew Jędrzejewski-Szmek | c4432d5 | 2012-03-01 13:26:44 +0100 | [diff] [blame] | 122 | while read verb expect cmd args |
| 123 | do |
| 124 | test_expect_success "$cmd $verb not enough COLUMNS (big change)" ' |
| 125 | COLUMNS=40 git $cmd $args >output |
| 126 | grep " | " output >actual && |
| 127 | test_cmp "$expect" actual |
| 128 | ' |
Zbigniew Jędrzejewski-Szmek | df44483 | 2012-03-01 13:26:46 +0100 | [diff] [blame] | 129 | |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 130 | test "$cmd" != diff || continue |
| 131 | |
| 132 | test_expect_success "$cmd --graph $verb not enough COLUMNS (big change)" ' |
| 133 | COLUMNS=40 git $cmd $args --graph >output |
| 134 | grep " | " output >actual && |
| 135 | test_cmp "$expect-graph" actual |
| 136 | ' |
Lucian Poston | 36dcc02 | 2012-04-16 03:44:52 -0700 | [diff] [blame] | 137 | done <<\EOF |
| 138 | ignores expect80 format-patch -1 --stdout |
| 139 | respects expect40 diff HEAD^ HEAD --stat |
| 140 | respects expect40 show --stat |
| 141 | respects expect40 log -1 --stat |
| 142 | EOF |
| 143 | |
| 144 | cat >expect40 <<'EOF' |
| 145 | abcd | 1000 ++++++++++++++++++++++++++ |
| 146 | EOF |
| 147 | cat >expect40-graph <<'EOF' |
| 148 | | abcd | 1000 ++++++++++++++++++++++++++ |
| 149 | EOF |
| 150 | while read verb expect cmd args |
| 151 | do |
| 152 | test_expect_success "$cmd $verb statGraphWidth config" ' |
| 153 | git -c diff.statGraphWidth=26 $cmd $args >output |
| 154 | grep " | " output >actual && |
| 155 | test_cmp "$expect" actual |
| 156 | ' |
| 157 | |
| 158 | test "$cmd" != diff || continue |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 159 | |
| 160 | test_expect_success "$cmd --graph $verb statGraphWidth config" ' |
| 161 | git -c diff.statGraphWidth=26 $cmd $args --graph >output |
| 162 | grep " | " output >actual && |
| 163 | test_cmp "$expect-graph" actual |
| 164 | ' |
Zbigniew Jędrzejewski-Szmek | c4432d5 | 2012-03-01 13:26:44 +0100 | [diff] [blame] | 165 | done <<\EOF |
| 166 | ignores expect80 format-patch -1 --stdout |
| 167 | respects expect40 diff HEAD^ HEAD --stat |
| 168 | respects expect40 show --stat |
| 169 | respects expect40 log -1 --stat |
| 170 | EOF |
| 171 | |
| 172 | |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 173 | cat >expect <<'EOF' |
| 174 | abcd | 1000 ++++++++++++++++++++++++++ |
| 175 | EOF |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 176 | cat >expect-graph <<'EOF' |
| 177 | | abcd | 1000 ++++++++++++++++++++++++++ |
| 178 | EOF |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 179 | while read cmd args |
| 180 | do |
| 181 | test_expect_success "$cmd --stat=width with big change" ' |
| 182 | git $cmd $args --stat=40 >output |
| 183 | grep " | " output >actual && |
| 184 | test_cmp expect actual |
| 185 | ' |
| 186 | |
| 187 | test_expect_success "$cmd --stat-width=width with big change" ' |
| 188 | git $cmd $args --stat-width=40 >output |
| 189 | grep " | " output >actual && |
| 190 | test_cmp expect actual |
| 191 | ' |
Zbigniew Jędrzejewski-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 192 | |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 193 | test_expect_success "$cmd --stat-graph-width with big change" ' |
Zbigniew Jędrzejewski-Szmek | 969fe57 | 2012-03-01 13:26:45 +0100 | [diff] [blame] | 194 | git $cmd $args --stat-graph-width=26 >output |
| 195 | grep " | " output >actual && |
| 196 | test_cmp expect actual |
| 197 | ' |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 198 | |
| 199 | test "$cmd" != diff || continue |
| 200 | |
| 201 | test_expect_success "$cmd --stat-width=width --graph with big change" ' |
| 202 | git $cmd $args --stat-width=40 --graph >output |
| 203 | grep " | " output >actual && |
| 204 | test_cmp expect-graph actual |
| 205 | ' |
| 206 | |
| 207 | test_expect_success "$cmd --stat-graph-width --graph with big change" ' |
| 208 | git $cmd $args --stat-graph-width=26 --graph >output |
| 209 | grep " | " output >actual && |
| 210 | test_cmp expect-graph actual |
| 211 | ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 212 | done <<\EOF |
| 213 | format-patch -1 --stdout |
| 214 | diff HEAD^ HEAD --stat |
| 215 | show --stat |
| 216 | log -1 --stat |
| 217 | EOF |
| 218 | |
| 219 | test_expect_success 'preparation for long filename tests' ' |
| 220 | cp abcd aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa && |
| 221 | git add aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa && |
| 222 | git commit -m message |
| 223 | ' |
| 224 | |
| 225 | cat >expect <<'EOF' |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 226 | ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++ |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 227 | EOF |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 228 | cat >expect-graph <<'EOF' |
| 229 | | ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++ |
| 230 | EOF |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 231 | while read cmd args |
| 232 | do |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 233 | test_expect_success "$cmd --stat=width with big change is more balanced" ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 234 | git $cmd $args --stat-width=60 >output && |
| 235 | grep " | " output >actual && |
| 236 | test_cmp expect actual |
| 237 | ' |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 238 | |
| 239 | test "$cmd" != diff || continue |
| 240 | |
| 241 | test_expect_success "$cmd --stat=width --graph with big change is balanced" ' |
| 242 | git $cmd $args --stat-width=60 --graph >output && |
| 243 | grep " | " output >actual && |
| 244 | test_cmp expect-graph actual |
| 245 | ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 246 | done <<\EOF |
| 247 | format-patch -1 --stdout |
| 248 | diff HEAD^ HEAD --stat |
| 249 | show --stat |
| 250 | log -1 --stat |
| 251 | EOF |
| 252 | |
| 253 | cat >expect80 <<'EOF' |
| 254 | ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++ |
| 255 | EOF |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 256 | cat >expect80-graph <<'EOF' |
| 257 | | ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++ |
| 258 | EOF |
Zbigniew Jędrzejewski-Szmek | af9fedc | 2012-03-01 13:26:39 +0100 | [diff] [blame] | 259 | cat >expect200 <<'EOF' |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 260 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
Zbigniew Jędrzejewski-Szmek | af9fedc | 2012-03-01 13:26:39 +0100 | [diff] [blame] | 261 | EOF |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 262 | cat >expect200-graph <<'EOF' |
Lucian Poston | 36dcc02 | 2012-04-16 03:44:52 -0700 | [diff] [blame] | 263 | | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 264 | EOF |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 265 | while read verb expect cmd args |
| 266 | do |
| 267 | test_expect_success "$cmd $verb COLUMNS (long filename)" ' |
| 268 | COLUMNS=200 git $cmd $args >output |
| 269 | grep " | " output >actual && |
| 270 | test_cmp "$expect" actual |
| 271 | ' |
Zbigniew Jędrzejewski-Szmek | 8c188c7 | 2012-04-16 03:44:49 -0700 | [diff] [blame] | 272 | |
| 273 | test "$cmd" != diff || continue |
| 274 | |
| 275 | test_expect_success "$cmd --graph $verb COLUMNS (long filename)" ' |
| 276 | COLUMNS=200 git $cmd $args --graph >output |
| 277 | grep " | " output >actual && |
| 278 | test_cmp "$expect-graph" actual |
| 279 | ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 280 | done <<\EOF |
| 281 | ignores expect80 format-patch -1 --stdout |
Zbigniew Jędrzejewski-Szmek | af9fedc | 2012-03-01 13:26:39 +0100 | [diff] [blame] | 282 | respects expect200 diff HEAD^ HEAD --stat |
Zbigniew Jędrzejewski-Szmek | 666c92a | 2012-03-01 13:26:40 +0100 | [diff] [blame] | 283 | respects expect200 show --stat |
Zbigniew Jędrzejewski-Szmek | 5e0ec15 | 2012-03-01 13:26:41 +0100 | [diff] [blame] | 284 | respects expect200 log -1 --stat |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 285 | EOF |
| 286 | |
Lucian Poston | da79161 | 2012-04-18 14:09:33 -0700 | [diff] [blame^] | 287 | cat >expect1 <<'EOF' |
| 288 | ...aaaaaaa | 1000 ++++++ |
| 289 | EOF |
| 290 | cat >expect1-graph <<'EOF' |
| 291 | | ...aaaaaaa | 1000 ++++++ |
| 292 | EOF |
| 293 | while read teststate verb expect cmd args |
| 294 | do |
| 295 | test_expect_$teststate "$cmd $verb prefix greater than COLUMNS (big change)" ' |
| 296 | COLUMNS=1 git $cmd $args >output |
| 297 | grep " | " output >actual && |
| 298 | test_cmp "$expect" actual |
| 299 | ' |
| 300 | |
| 301 | test "$cmd" != diff || continue |
| 302 | |
| 303 | test_expect_$teststate "$cmd --graph $verb prefix greater than COLUMNS (big change)" ' |
| 304 | COLUMNS=1 git $cmd $args --graph >output |
| 305 | grep " | " output >actual && |
| 306 | test_cmp "$expect-graph" actual |
| 307 | ' |
| 308 | done <<\EOF |
| 309 | success ignores expect80 format-patch -1 --stdout |
| 310 | failure respects expect1 diff HEAD^ HEAD --stat |
| 311 | failure respects expect1 show --stat |
| 312 | failure respects expect1 log -1 --stat |
| 313 | EOF |
| 314 | |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 315 | cat >expect <<'EOF' |
Zbigniew Jędrzejewski-Szmek | 7a7159a | 2012-03-01 13:26:42 +0100 | [diff] [blame] | 316 | abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 317 | EOF |
Zbigniew Jędrzejewski-Szmek | 7a7159a | 2012-03-01 13:26:42 +0100 | [diff] [blame] | 318 | test_expect_success 'merge --stat respects COLUMNS (big change)' ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 319 | git checkout -b branch HEAD^^ && |
| 320 | COLUMNS=100 git merge --stat --no-ff master^ >output && |
| 321 | grep " | " output >actual |
| 322 | test_cmp expect actual |
| 323 | ' |
| 324 | |
| 325 | cat >expect <<'EOF' |
Zbigniew Jędrzejewski-Szmek | 1b058bc | 2012-03-01 13:26:43 +0100 | [diff] [blame] | 326 | aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++ |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 327 | EOF |
Zbigniew Jędrzejewski-Szmek | 7a7159a | 2012-03-01 13:26:42 +0100 | [diff] [blame] | 328 | test_expect_success 'merge --stat respects COLUMNS (long filename)' ' |
Junio C Hamano | 31c2373 | 2012-03-01 13:26:38 +0100 | [diff] [blame] | 329 | COLUMNS=100 git merge --stat --no-ff master >output && |
| 330 | grep " | " output >actual |
| 331 | test_cmp expect actual |
| 332 | ' |
| 333 | |
| 334 | test_done |