t / t3900-i18n-commit.shon commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Junio C Hamano
   4#
   5
   6test_description='commit and log output encodings'
   7
   8. ./test-lib.sh
   9
  10compare_with () {
  11        git show -s $1 | sed -e '1,/^$/d' -e 's/^    //' >current &&
  12        case "$3" in
  13        '')
  14                test_cmp "$2" current ;;
  15        ?*)
  16                iconv -f "$3" -t UTF-8 >current.utf8 <current &&
  17                iconv -f "$3" -t UTF-8 >expect.utf8 <"$2" &&
  18                test_cmp expect.utf8 current.utf8
  19                ;;
  20        esac
  21}
  22
  23test_expect_success setup '
  24        : >F &&
  25        git add F &&
  26        T=$(git write-tree) &&
  27        C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) &&
  28        git update-ref HEAD $C &&
  29        git tag C0
  30'
  31
  32test_expect_success 'no encoding header for base case' '
  33        E=$(git cat-file commit C0 | sed -ne "s/^encoding //p") &&
  34        test z = "z$E"
  35'
  36
  37for H in ISO8859-1 eucJP ISO-2022-JP
  38do
  39        test_expect_success "$H setup" '
  40                git config i18n.commitencoding $H &&
  41                git checkout -b $H C0 &&
  42                echo $H >F &&
  43                git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
  44        '
  45done
  46
  47for H in ISO8859-1 eucJP ISO-2022-JP
  48do
  49        test_expect_success "check encoding header for $H" '
  50                E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") &&
  51                test "z$E" = "z'$H'"
  52        '
  53done
  54
  55test_expect_success 'config to remove customization' '
  56        git config --unset-all i18n.commitencoding &&
  57        if Z=$(git config --get-all i18n.commitencoding)
  58        then
  59                echo Oops, should have failed.
  60                false
  61        else
  62                test z = "z$Z"
  63        fi &&
  64        git config i18n.commitencoding UTF-8
  65'
  66
  67test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
  68        compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
  69'
  70
  71for H in eucJP ISO-2022-JP
  72do
  73        test_expect_success "$H should be shown in UTF-8 now" '
  74                compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
  75        '
  76done
  77
  78test_expect_success 'config to add customization' '
  79        git config --unset-all i18n.commitencoding &&
  80        if Z=$(git config --get-all i18n.commitencoding)
  81        then
  82                echo Oops, should have failed.
  83                false
  84        else
  85                test z = "z$Z"
  86        fi
  87'
  88
  89for H in ISO8859-1 eucJP ISO-2022-JP
  90do
  91        test_expect_success "$H should be shown in itself now" '
  92                git config i18n.commitencoding '$H' &&
  93                compare_with '$H' "$TEST_DIRECTORY"/t3900/'$H'.txt
  94        '
  95done
  96
  97test_expect_success 'config to tweak customization' '
  98        git config i18n.logoutputencoding UTF-8
  99'
 100
 101test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
 102        compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
 103'
 104
 105for H in eucJP ISO-2022-JP
 106do
 107        test_expect_success "$H should be shown in UTF-8 now" '
 108                compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
 109        '
 110done
 111
 112for J in eucJP ISO-2022-JP
 113do
 114        if test "$J" = ISO-2022-JP
 115        then
 116                ICONV=$J
 117        else
 118                ICONV=
 119        fi
 120        git config i18n.logoutputencoding $J
 121        for H in eucJP ISO-2022-JP
 122        do
 123                test_expect_success "$H should be shown in $J now" '
 124                        compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV
 125                '
 126        done
 127done
 128
 129for H in ISO8859-1 eucJP ISO-2022-JP
 130do
 131        test_expect_success "No conversion with $H" '
 132                compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt
 133        '
 134done
 135
 136test_done