t / t6006-rev-list-format.shon commit t3506: validate '-m 1 -ff' is now accepted for non-merge commits (1c32013)
   1#!/bin/sh
   2
   3# Copyright (c) 2009 Jens Lehmann
   4# Copyright (c) 2011 Alexey Shumkin (+ non-UTF-8 commit encoding tests)
   5
   6test_description='git rev-list --pretty=format test'
   7
   8. ./test-lib.sh
   9. "$TEST_DIRECTORY"/lib-terminal.sh
  10
  11test_tick
  12# Tested non-UTF-8 encoding
  13test_encoding="ISO8859-1"
  14
  15# String "added" in German
  16# (translated with Google Translate),
  17# encoded in UTF-8, used as a commit log message below.
  18added_utf8_part=$(printf "\303\274")
  19added_utf8_part_iso88591=$(echo "$added_utf8_part" | iconv -f utf-8 -t $test_encoding)
  20added=$(printf "added (hinzugef${added_utf8_part}gt) foo")
  21added_iso88591=$(echo "$added" | iconv -f utf-8 -t $test_encoding)
  22# same but "changed"
  23changed_utf8_part=$(printf "\303\244")
  24changed_utf8_part_iso88591=$(echo "$changed_utf8_part" | iconv -f utf-8 -t $test_encoding)
  25changed=$(printf "changed (ge${changed_utf8_part}ndert) foo")
  26changed_iso88591=$(echo "$changed" | iconv -f utf-8 -t $test_encoding)
  27
  28# Count of char to truncate
  29# Number is chosen so, that non-ACSII characters
  30# (see $added_utf8_part and $changed_utf8_part)
  31# fall into truncated parts of appropriate words both from left and right
  32truncate_count=20
  33
  34test_expect_success 'setup' '
  35        : >foo &&
  36        git add foo &&
  37        git config i18n.commitEncoding $test_encoding &&
  38        echo "$added_iso88591" | git commit -F - &&
  39        head1=$(git rev-parse --verify HEAD) &&
  40        head1_short=$(git rev-parse --verify --short $head1) &&
  41        tree1=$(git rev-parse --verify HEAD:) &&
  42        tree1_short=$(git rev-parse --verify --short $tree1) &&
  43        echo "$changed" > foo &&
  44        echo "$changed_iso88591" | git commit -a -F - &&
  45        head2=$(git rev-parse --verify HEAD) &&
  46        head2_short=$(git rev-parse --verify --short $head2) &&
  47        tree2=$(git rev-parse --verify HEAD:) &&
  48        tree2_short=$(git rev-parse --verify --short $tree2) &&
  49        git config --unset i18n.commitEncoding
  50'
  51
  52# usage: test_format name format_string [failure] <expected_output
  53test_format () {
  54        cat >expect.$1
  55        test_expect_${3:-success} "format $1" "
  56                git rev-list --pretty=format:'$2' master >output.$1 &&
  57                test_cmp expect.$1 output.$1
  58        "
  59}
  60
  61# Feed to --format to provide predictable colored sequences.
  62BASIC_COLOR='%Credfoo%Creset'
  63COLOR='%C(red)foo%C(reset)'
  64AUTO_COLOR='%C(auto,red)foo%C(auto,reset)'
  65ALWAYS_COLOR='%C(always,red)foo%C(always,reset)'
  66has_color () {
  67        test_decode_color <"$1" >decoded &&
  68        echo "<RED>foo<RESET>" >expect &&
  69        test_cmp expect decoded
  70}
  71
  72has_no_color () {
  73        echo foo >expect &&
  74        test_cmp expect "$1"
  75}
  76
  77test_format percent %%h <<EOF
  78commit $head2
  79%h
  80commit $head1
  81%h
  82EOF
  83
  84test_format hash %H%n%h <<EOF
  85commit $head2
  86$head2
  87$head2_short
  88commit $head1
  89$head1
  90$head1_short
  91EOF
  92
  93test_format tree %T%n%t <<EOF
  94commit $head2
  95$tree2
  96$tree2_short
  97commit $head1
  98$tree1
  99$tree1_short
 100EOF
 101
 102test_format parents %P%n%p <<EOF
 103commit $head2
 104$head1
 105$head1_short
 106commit $head1
 107
 108
 109EOF
 110
 111# we don't test relative here
 112test_format author %an%n%ae%n%ad%n%aD%n%at <<EOF
 113commit $head2
 114A U Thor
 115author@example.com
 116Thu Apr 7 15:13:13 2005 -0700
 117Thu, 7 Apr 2005 15:13:13 -0700
 1181112911993
 119commit $head1
 120A U Thor
 121author@example.com
 122Thu Apr 7 15:13:13 2005 -0700
 123Thu, 7 Apr 2005 15:13:13 -0700
 1241112911993
 125EOF
 126
 127test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<EOF
 128commit $head2
 129C O Mitter
 130committer@example.com
 131Thu Apr 7 15:13:13 2005 -0700
 132Thu, 7 Apr 2005 15:13:13 -0700
 1331112911993
 134commit $head1
 135C O Mitter
 136committer@example.com
 137Thu Apr 7 15:13:13 2005 -0700
 138Thu, 7 Apr 2005 15:13:13 -0700
 1391112911993
 140EOF
 141
 142test_format encoding %e <<EOF
 143commit $head2
 144$test_encoding
 145commit $head1
 146$test_encoding
 147EOF
 148
 149test_format subject %s <<EOF
 150commit $head2
 151$changed
 152commit $head1
 153$added
 154EOF
 155
 156test_format subject-truncated "%<($truncate_count,trunc)%s" <<EOF
 157commit $head2
 158changed (ge${changed_utf8_part}ndert)..
 159commit $head1
 160added (hinzugef${added_utf8_part}gt..
 161EOF
 162
 163test_format body %b <<EOF
 164commit $head2
 165commit $head1
 166EOF
 167
 168test_format raw-body %B <<EOF
 169commit $head2
 170$changed
 171
 172commit $head1
 173$added
 174
 175EOF
 176
 177test_expect_success 'basic colors' '
 178        cat >expect <<-EOF &&
 179        commit $head2
 180        <RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
 181        EOF
 182        format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
 183        git rev-list --color --format="$format" -1 master >actual.raw &&
 184        test_decode_color <actual.raw >actual &&
 185        test_cmp expect actual
 186'
 187
 188test_expect_success 'advanced colors' '
 189        cat >expect <<-EOF &&
 190        commit $head2
 191        <BOLD;RED;BYELLOW>foo<RESET>
 192        EOF
 193        format="%C(red yellow bold)foo%C(reset)" &&
 194        git rev-list --color --format="$format" -1 master >actual.raw &&
 195        test_decode_color <actual.raw >actual &&
 196        test_cmp expect actual
 197'
 198
 199for spec in \
 200        "%Cred:$BASIC_COLOR" \
 201        "%C(...):$COLOR" \
 202        "%C(auto,...):$AUTO_COLOR"
 203do
 204        desc=${spec%%:*}
 205        color=${spec#*:}
 206        test_expect_success "$desc does not enable color by default" '
 207                git log --format=$color -1 >actual &&
 208                has_no_color actual
 209        '
 210
 211        test_expect_success "$desc enables colors for color.diff" '
 212                git -c color.diff=always log --format=$color -1 >actual &&
 213                has_color actual
 214        '
 215
 216        test_expect_success "$desc enables colors for color.ui" '
 217                git -c color.ui=always log --format=$color -1 >actual &&
 218                has_color actual
 219        '
 220
 221        test_expect_success "$desc respects --color" '
 222                git log --format=$color -1 --color >actual &&
 223                has_color actual
 224        '
 225
 226        test_expect_success "$desc respects --no-color" '
 227                git -c color.ui=always log --format=$color -1 --no-color >actual &&
 228                has_no_color actual
 229        '
 230
 231        test_expect_success TTY "$desc respects --color=auto (stdout is tty)" '
 232                test_terminal git log --format=$color -1 --color=auto >actual &&
 233                has_color actual
 234        '
 235
 236        test_expect_success "$desc respects --color=auto (stdout not tty)" '
 237                (
 238                        TERM=vt100 && export TERM &&
 239                        git log --format=$color -1 --color=auto >actual &&
 240                        has_no_color actual
 241                )
 242        '
 243done
 244
 245test_expect_success '%C(always,...) enables color even without tty' '
 246        git log --format=$ALWAYS_COLOR -1 >actual &&
 247        has_color actual
 248'
 249
 250test_expect_success '%C(auto) respects --color' '
 251        git log --color --format="%C(auto)%H" -1 >actual.raw &&
 252        test_decode_color <actual.raw >actual &&
 253        echo "<YELLOW>$(git rev-parse HEAD)<RESET>" >expect &&
 254        test_cmp expect actual
 255'
 256
 257test_expect_success '%C(auto) respects --no-color' '
 258        git log --no-color --format="%C(auto)%H" -1 >actual &&
 259        git rev-parse HEAD >expect &&
 260        test_cmp expect actual
 261'
 262
 263test_expect_success 'rev-list %C(auto,...) respects --color' '
 264        git rev-list --color --format="%C(auto,green)foo%C(auto,reset)" \
 265                -1 HEAD >actual.raw &&
 266        test_decode_color <actual.raw >actual &&
 267        cat >expect <<-EOF &&
 268        commit $(git rev-parse HEAD)
 269        <GREEN>foo<RESET>
 270        EOF
 271        test_cmp expect actual
 272'
 273
 274iconv -f utf-8 -t $test_encoding > commit-msg <<EOF
 275Test printing of complex bodies
 276
 277This commit message is much longer than the others,
 278and it will be encoded in $test_encoding. We should therefore
 279include an ISO8859 character: ¡bueno!
 280EOF
 281
 282test_expect_success 'setup complex body' '
 283        git config i18n.commitencoding $test_encoding &&
 284        echo change2 >foo && git commit -a -F commit-msg &&
 285        head3=$(git rev-parse --verify HEAD) &&
 286        head3_short=$(git rev-parse --short $head3)
 287'
 288
 289test_format complex-encoding %e <<EOF
 290commit $head3
 291$test_encoding
 292commit $head2
 293$test_encoding
 294commit $head1
 295$test_encoding
 296EOF
 297
 298test_format complex-subject %s <<EOF
 299commit $head3
 300Test printing of complex bodies
 301commit $head2
 302$changed_iso88591
 303commit $head1
 304$added_iso88591
 305EOF
 306
 307test_format complex-subject-trunc "%<($truncate_count,trunc)%s" <<EOF
 308commit $head3
 309Test printing of c..
 310commit $head2
 311changed (ge${changed_utf8_part_iso88591}ndert)..
 312commit $head1
 313added (hinzugef${added_utf8_part_iso88591}gt..
 314EOF
 315
 316test_format complex-subject-mtrunc "%<($truncate_count,mtrunc)%s" <<EOF
 317commit $head3
 318Test prin..ex bodies
 319commit $head2
 320changed (..dert) foo
 321commit $head1
 322added (hi..f${added_utf8_part_iso88591}gt) foo
 323EOF
 324
 325test_format complex-subject-ltrunc "%<($truncate_count,ltrunc)%s" <<EOF
 326commit $head3
 327.. of complex bodies
 328commit $head2
 329..ged (ge${changed_utf8_part_iso88591}ndert) foo
 330commit $head1
 331.. (hinzugef${added_utf8_part_iso88591}gt) foo
 332EOF
 333
 334test_expect_success 'prepare expected messages (for test %b)' '
 335        cat <<-EOF >expected.utf-8 &&
 336        commit $head3
 337        This commit message is much longer than the others,
 338        and it will be encoded in $test_encoding. We should therefore
 339        include an ISO8859 character: ¡bueno!
 340
 341        commit $head2
 342        commit $head1
 343        EOF
 344        iconv -f utf-8 -t $test_encoding expected.utf-8 >expected.ISO8859-1
 345'
 346
 347test_format complex-body %b <expected.ISO8859-1
 348
 349# Git uses i18n.commitEncoding if no i18n.logOutputEncoding set
 350# so unset i18n.commitEncoding to test encoding conversion
 351git config --unset i18n.commitEncoding
 352
 353test_format complex-subject-commitencoding-unset %s <<EOF
 354commit $head3
 355Test printing of complex bodies
 356commit $head2
 357$changed
 358commit $head1
 359$added
 360EOF
 361
 362test_format complex-subject-commitencoding-unset-trunc "%<($truncate_count,trunc)%s" <<EOF
 363commit $head3
 364Test printing of c..
 365commit $head2
 366changed (ge${changed_utf8_part}ndert)..
 367commit $head1
 368added (hinzugef${added_utf8_part}gt..
 369EOF
 370
 371test_format complex-subject-commitencoding-unset-mtrunc "%<($truncate_count,mtrunc)%s" <<EOF
 372commit $head3
 373Test prin..ex bodies
 374commit $head2
 375changed (..dert) foo
 376commit $head1
 377added (hi..f${added_utf8_part}gt) foo
 378EOF
 379
 380test_format complex-subject-commitencoding-unset-ltrunc "%<($truncate_count,ltrunc)%s" <<EOF
 381commit $head3
 382.. of complex bodies
 383commit $head2
 384..ged (ge${changed_utf8_part}ndert) foo
 385commit $head1
 386.. (hinzugef${added_utf8_part}gt) foo
 387EOF
 388
 389test_format complex-body-commitencoding-unset %b <expected.utf-8
 390
 391test_expect_success '%x00 shows NUL' '
 392        echo  >expect commit $head3 &&
 393        echo >>expect fooQbar &&
 394        git rev-list -1 --format=foo%x00bar HEAD >actual.nul &&
 395        nul_to_q <actual.nul >actual &&
 396        test_cmp expect actual
 397'
 398
 399test_expect_success '%ad respects --date=' '
 400        echo 2005-04-07 >expect.ad-short &&
 401        git log -1 --date=short --pretty=tformat:%ad >output.ad-short master &&
 402        test_cmp expect.ad-short output.ad-short
 403'
 404
 405test_expect_success 'empty email' '
 406        test_tick &&
 407        C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
 408        A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
 409        verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700"
 410'
 411
 412test_expect_success 'del LF before empty (1)' '
 413        git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
 414        test_line_count = 2 actual
 415'
 416
 417test_expect_success 'del LF before empty (2)' '
 418        git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
 419        test_line_count = 6 actual &&
 420        grep "^$" actual
 421'
 422
 423test_expect_success 'add LF before non-empty (1)' '
 424        git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
 425        test_line_count = 2 actual
 426'
 427
 428test_expect_success 'add LF before non-empty (2)' '
 429        git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
 430        test_line_count = 6 actual &&
 431        grep "^$" actual
 432'
 433
 434test_expect_success 'add SP before non-empty (1)' '
 435        git show -s --pretty=format:"%s% bThanks" HEAD^^ >actual &&
 436        test $(wc -w <actual) = 3
 437'
 438
 439test_expect_success 'add SP before non-empty (2)' '
 440        git show -s --pretty=format:"%s% sThanks" HEAD^^ >actual &&
 441        test $(wc -w <actual) = 6
 442'
 443
 444test_expect_success '--abbrev' '
 445        echo SHORT SHORT SHORT >expect2 &&
 446        echo LONG LONG LONG >expect3 &&
 447        git log -1 --format="%h %h %h" HEAD >actual1 &&
 448        git log -1 --abbrev=5 --format="%h %h %h" HEAD >actual2 &&
 449        git log -1 --abbrev=5 --format="%H %H %H" HEAD >actual3 &&
 450        sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual2 >fuzzy2 &&
 451        sed -e "s/$OID_REGEX/LONG/g" -e "s/$_x05/SHORT/g" <actual3 >fuzzy3 &&
 452        test_cmp expect2 fuzzy2 &&
 453        test_cmp expect3 fuzzy3 &&
 454        ! test_cmp actual1 actual2
 455'
 456
 457test_expect_success '%H is not affected by --abbrev-commit' '
 458        git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
 459        len=$(wc -c <actual) &&
 460        test $len = 41
 461'
 462
 463test_expect_success '%h is not affected by --abbrev-commit' '
 464        git log -1 --format=%h --abbrev-commit --abbrev=20 HEAD >actual &&
 465        len=$(wc -c <actual) &&
 466        test $len = 21
 467'
 468
 469test_expect_success '"%h %gD: %gs" is same as git-reflog' '
 470        git reflog >expect &&
 471        git log -g --format="%h %gD: %gs" >actual &&
 472        test_cmp expect actual
 473'
 474
 475test_expect_success '"%h %gD: %gs" is same as git-reflog (with date)' '
 476        git reflog --date=raw >expect &&
 477        git log -g --format="%h %gD: %gs" --date=raw >actual &&
 478        test_cmp expect actual
 479'
 480
 481test_expect_success '"%h %gD: %gs" is same as git-reflog (with --abbrev)' '
 482        git reflog --abbrev=13 --date=raw >expect &&
 483        git log -g --abbrev=13 --format="%h %gD: %gs" --date=raw >actual &&
 484        test_cmp expect actual
 485'
 486
 487test_expect_success '%gd shortens ref name' '
 488        echo "master@{0}" >expect.gd-short &&
 489        git log -g -1 --format=%gd refs/heads/master >actual.gd-short &&
 490        test_cmp expect.gd-short actual.gd-short
 491'
 492
 493test_expect_success 'reflog identity' '
 494        echo "C O Mitter:committer@example.com" >expect &&
 495        git log -g -1 --format="%gn:%ge" >actual &&
 496        test_cmp expect actual
 497'
 498
 499test_expect_success 'oneline with empty message' '
 500        git commit -m "dummy" --allow-empty &&
 501        git commit -m "dummy" --allow-empty &&
 502        git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
 503        git rev-list --oneline HEAD >test.txt &&
 504        test_line_count = 5 test.txt &&
 505        git rev-list --oneline --graph HEAD >testg.txt &&
 506        test_line_count = 5 testg.txt
 507'
 508
 509test_expect_success 'single-character name is parsed correctly' '
 510        git commit --author="a <a@example.com>" --allow-empty -m foo &&
 511        echo "a <a@example.com>" >expect &&
 512        git log -1 --format="%an <%ae>" >actual &&
 513        test_cmp expect actual
 514'
 515
 516test_expect_success 'unused %G placeholders are passed through' '
 517        echo "%GX %G" >expect &&
 518        git log -1 --format="%GX %G" >actual &&
 519        test_cmp expect actual
 520'
 521
 522test_done