t4202-log.sh 8.5 KB
Newer Older
A
Arjen Laarhoven 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
#!/bin/sh

test_description='git log'

. ./test-lib.sh

test_expect_success setup '

	echo one >one &&
	git add one &&
	test_tick &&
	git commit -m initial &&

	echo ichi >one &&
	git add one &&
	test_tick &&
	git commit -m second &&

A
Arjen Laarhoven 已提交
19
	git mv one ichi &&
A
Arjen Laarhoven 已提交
20 21 22
	test_tick &&
	git commit -m third &&

A
Arjen Laarhoven 已提交
23 24
	cp ichi ein &&
	git add ein &&
A
Arjen Laarhoven 已提交
25 26 27
	test_tick &&
	git commit -m fourth &&

A
Arjen Laarhoven 已提交
28 29 30 31 32 33 34
	mkdir a &&
	echo ni >a/two &&
	git add a/two &&
	test_tick &&
	git commit -m fifth  &&

	git rm a/two &&
A
Arjen Laarhoven 已提交
35
	test_tick &&
A
Arjen Laarhoven 已提交
36
	git commit -m sixth
A
Arjen Laarhoven 已提交
37 38 39

'

40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial" > expect
test_expect_success 'pretty' '

	git log --pretty="format:%s" > actual &&
	test_cmp expect actual
'

printf "sixth\nfifth\nfourth\nthird\nsecond\ninitial\n" > expect
test_expect_success 'pretty (tformat)' '

	git log --pretty="tformat:%s" > actual &&
	test_cmp expect actual
'

test_expect_success 'pretty (shortcut)' '

	git log --pretty="%s" > actual &&
	test_cmp expect actual
'

test_expect_success 'format' '

	git log --format="%s" > actual &&
	test_cmp expect actual
'

66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86
cat > expect << EOF
 This is
  the sixth
  commit.
 This is
  the fifth
  commit.
EOF

test_expect_success 'format %w(12,1,2)' '

	git log -2 --format="%w(12,1,2)This is the %s commit." > actual &&
	test_cmp expect actual
'

test_expect_success 'format %w(,1,2)' '

	git log -2 --format="%w(,1,2)This is%nthe %s%ncommit." > actual &&
	test_cmp expect actual
'

87 88 89 90 91 92 93 94 95 96 97 98 99 100
cat > expect << EOF
804a787 sixth
394ef78 fifth
5d31159 fourth
2fbe8c0 third
f7dab8e second
3a2fdcb initial
EOF
test_expect_success 'oneline' '

	git log --oneline > actual &&
	test_cmp expect actual
'

A
Arjen Laarhoven 已提交
101 102 103
test_expect_success 'diff-filter=A' '

	actual=$(git log --pretty="format:%s" --diff-filter=A HEAD) &&
A
Arjen Laarhoven 已提交
104
	expect=$(echo fifth ; echo fourth ; echo third ; echo initial) &&
A
Arjen Laarhoven 已提交
105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'diff-filter=M' '

	actual=$(git log --pretty="format:%s" --diff-filter=M HEAD) &&
	expect=$(echo second) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'diff-filter=D' '

	actual=$(git log --pretty="format:%s" --diff-filter=D HEAD) &&
A
Arjen Laarhoven 已提交
128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164
	expect=$(echo sixth ; echo third) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'diff-filter=R' '

	actual=$(git log -M --pretty="format:%s" --diff-filter=R HEAD) &&
	expect=$(echo third) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'diff-filter=C' '

	actual=$(git log -C -C --pretty="format:%s" --diff-filter=C HEAD) &&
	expect=$(echo fourth) &&
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

test_expect_success 'git log --follow' '

	actual=$(git log --follow --pretty="format:%s" ichi) &&
	expect=$(echo third ; echo second ; echo initial) &&
A
Arjen Laarhoven 已提交
165 166 167 168 169 170 171 172
	test "$actual" = "$expect" || {
		echo Oops
		echo "Actual: $actual"
		false
	}

'

173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192
cat > expect << EOF
804a787 sixth
394ef78 fifth
5d31159 fourth
EOF
test_expect_success 'git log --no-walk <commits> sorts by commit time' '
	git log --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
	test_cmp expect actual
'

cat > expect << EOF
5d31159 fourth
804a787 sixth
394ef78 fifth
EOF
test_expect_success 'git show <commits> leaves list of commits as given' '
	git show --oneline -s 5d31159 804a787 394ef78 > actual &&
	test_cmp expect actual
'

J
Jeff King 已提交
193 194 195
test_expect_success 'setup case sensitivity tests' '
	echo case >one &&
	test_tick &&
A
Arjen Laarhoven 已提交
196
	git add one
J
Jeff King 已提交
197 198 199 200 201 202 203 204
	git commit -a -m Second
'

test_expect_success 'log --grep' '
	echo second >expect &&
	git log -1 --pretty="tformat:%s" --grep=sec >actual &&
	test_cmp expect actual
'
A
Arjen Laarhoven 已提交
205

J
Jeff King 已提交
206 207 208 209 210 211 212 213 214 215 216
test_expect_success 'log -i --grep' '
	echo Second >expect &&
	git log -1 --pretty="tformat:%s" -i --grep=sec >actual &&
	test_cmp expect actual
'

test_expect_success 'log --grep -i' '
	echo Second >expect &&
	git log -1 --pretty="tformat:%s" --grep=sec -i >actual &&
	test_cmp expect actual
'
A
Arjen Laarhoven 已提交
217

T
Thomas Rast 已提交
218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257
cat > expect <<EOF
* Second
* sixth
* fifth
* fourth
* third
* second
* initial
EOF

test_expect_success 'simple log --graph' '
	git log --graph --pretty=tformat:%s >actual &&
	test_cmp expect actual
'

test_expect_success 'set up merge history' '
	git checkout -b side HEAD~4 &&
	test_commit side-1 1 1 &&
	test_commit side-2 2 2 &&
	git checkout master &&
	git merge side
'

cat > expect <<\EOF
*   Merge branch 'side'
|\
| * side-2
| * side-1
* | Second
* | sixth
* | fifth
* | fourth
|/
* third
* second
* initial
EOF

test_expect_success 'log --graph with merge' '
	git log --graph --date-order --pretty=tformat:%s |
258
		sed "s/ *\$//" >actual &&
T
Thomas Rast 已提交
259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317
	test_cmp expect actual
'

cat > expect <<\EOF
*   commit master
|\  Merge: A B
| | Author: A U Thor <author@example.com>
| |
| |     Merge branch 'side'
| |
| * commit side
| | Author: A U Thor <author@example.com>
| |
| |     side-2
| |
| * commit tags/side-1
| | Author: A U Thor <author@example.com>
| |
| |     side-1
| |
* | commit master~1
| | Author: A U Thor <author@example.com>
| |
| |     Second
| |
* | commit master~2
| | Author: A U Thor <author@example.com>
| |
| |     sixth
| |
* | commit master~3
| | Author: A U Thor <author@example.com>
| |
| |     fifth
| |
* | commit master~4
|/  Author: A U Thor <author@example.com>
|
|       fourth
|
* commit tags/side-1~1
| Author: A U Thor <author@example.com>
|
|     third
|
* commit tags/side-1~2
| Author: A U Thor <author@example.com>
|
|     second
|
* commit tags/side-1~3
  Author: A U Thor <author@example.com>

      initial
EOF

test_expect_success 'log --graph with full output' '
	git log --graph --date-order --pretty=short |
		git name-rev --name-only --stdin |
318
		sed "s/Merge:.*/Merge: A B/;s/ *\$//" >actual &&
T
Thomas Rast 已提交
319 320 321 322 323 324 325 326 327
	test_cmp expect actual
'

test_expect_success 'set up more tangled history' '
	git checkout -b tangle HEAD~6 &&
	test_commit tangle-a tangle-a a &&
	git merge master~3 &&
	git merge side~1 &&
	git checkout master &&
328 329 330 331 332 333 334 335 336 337 338 339 340
	git merge tangle &&
	git checkout -b reach &&
	test_commit reach &&
	git checkout master &&
	git checkout -b octopus-a &&
	test_commit octopus-a &&
	git checkout master &&
	git checkout -b octopus-b &&
	test_commit octopus-b &&
	git checkout master &&
	test_commit seventh &&
	git merge octopus-a octopus-b
	git merge reach
T
Thomas Rast 已提交
341 342 343
'

cat > expect <<\EOF
344
*   Merge commit 'reach'
345 346 347
|\
| \
|  \
348
*-. \   Merge commit 'octopus-a'; commit 'octopus-b'
349 350 351 352 353 354 355 356 357
|\ \ \
* | | | seventh
| | * | octopus-b
| |/ /
|/| |
| * | octopus-a
|/ /
| * reach
|/
T
Thomas Rast 已提交
358 359 360 361 362 363 364 365 366 367
*   Merge branch 'tangle'
|\
| *   Merge branch 'side' (early part) into tangle
| |\
| * \   Merge branch 'master' (early part) into tangle
| |\ \
| * | | tangle-a
* | | |   Merge branch 'side'
|\ \ \ \
| * | | | side-2
368
| | |_|/
T
Thomas Rast 已提交
369 370 371 372
| |/| |
| * | | side-1
* | | | Second
* | | | sixth
373
| |_|/
T
Thomas Rast 已提交
374 375 376 377 378 379 380 381 382 383
|/| |
* | | fifth
* | | fourth
|/ /
* | third
|/
* second
* initial
EOF

L
Linus Torvalds 已提交
384
test_expect_success 'log --graph with merge' '
T
Thomas Rast 已提交
385
	git log --graph --date-order --pretty=tformat:%s |
386
		sed "s/ *\$//" >actual &&
T
Thomas Rast 已提交
387 388 389
	test_cmp expect actual
'

J
Junio C Hamano 已提交
390 391 392
test_expect_success 'log.decorate configuration' '
	git config --unset-all log.decorate || :

393 394 395 396
	git log >expect.none &&
	git log --decorate >expect.short &&
	git log --decorate=full >expect.full &&
	git log --oneline >expect.oneline &&
J
Junio C Hamano 已提交
397 398

	echo "[log] decorate" >>.git/config &&
399
	git log >actual &&
J
Junio C Hamano 已提交
400
	test_cmp expect.short actual &&
401 402
	git log --oneline >actual &&
	test_cmp expect.oneline actual &&
J
Junio C Hamano 已提交
403 404 405

	git config --unset-all log.decorate &&
	git config log.decorate true &&
406
	git log >actual &&
J
Junio C Hamano 已提交
407
	test_cmp expect.short actual &&
408
	git log --decorate=full >actual &&
J
Junio C Hamano 已提交
409
	test_cmp expect.full actual &&
410
	git log --decorate=no >actual &&
J
Junio C Hamano 已提交
411
	test_cmp expect.none actual &&
412 413
	git log --oneline >actual &&
	test_cmp expect.oneline actual &&
J
Junio C Hamano 已提交
414 415 416

	git config --unset-all log.decorate &&
	git config log.decorate no &&
417
	git log >actual &&
J
Junio C Hamano 已提交
418
	test_cmp expect.none actual &&
419
	git log --decorate >actual &&
J
Junio C Hamano 已提交
420
	test_cmp expect.short actual &&
421
	git log --decorate=full >actual &&
J
Junio C Hamano 已提交
422
	test_cmp expect.full actual &&
423 424
	git log --oneline >actual &&
	test_cmp expect.oneline actual &&
J
Junio C Hamano 已提交
425 426 427

	git config --unset-all log.decorate &&
	git config log.decorate short &&
428
	git log >actual &&
J
Junio C Hamano 已提交
429
	test_cmp expect.short actual &&
430
	git log --no-decorate >actual &&
J
Junio C Hamano 已提交
431
	test_cmp expect.none actual &&
432
	git log --decorate=full >actual &&
J
Junio C Hamano 已提交
433
	test_cmp expect.full actual &&
434 435
	git log --oneline >actual &&
	test_cmp expect.oneline actual &&
J
Junio C Hamano 已提交
436 437 438

	git config --unset-all log.decorate &&
	git config log.decorate full &&
439
	git log >actual &&
J
Junio C Hamano 已提交
440
	test_cmp expect.full actual &&
441
	git log --no-decorate >actual &&
J
Junio C Hamano 已提交
442
	test_cmp expect.none actual &&
443
	git log --decorate >actual &&
J
Junio C Hamano 已提交
444
	test_cmp expect.short actual
445 446
	git log --oneline >actual &&
	test_cmp expect.oneline actual &&
J
Junio C Hamano 已提交
447

448
	:
J
Junio C Hamano 已提交
449 450
'

451 452
test_done