git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 0/8] Correct internal working and output encoding

From
Doan Tran Cong Danh <congdanhqx@gmail.com>
Date
Nov 6, 2019, 09:19 UTC
Message-ID
<cover.1573031848.git.congdanhqx@gmail.com>
In-Reply-To
<20191031092618.29073-1-congdanhqx@gmail.com>

The series is shifting from fixing test that failed on musl based Linux to correct the internal working encoding and output encoding of git-am git-cherry-pick git-rebase and git-revert.

Doan Tran Cong Danh (8):
  t0028: eliminate non-standard usage of printf
  configure.ac: define ICONV_OMITS_BOM if necessary
  t3900: demonstrate git-rebase problem with multi encoding
  sequencer: reencode to utf-8 before arrange rebase's todo list
  sequencer: reencode revert/cherry-pick's todo list
  sequencer: reencode squashing commit's message
  sequencer: reencode old merge-commit message
  sequencer: reencode commit message for am/rebase --show-current-patch
 configure.ac                     | 49 ++++++++++++++++++++++++++++++++
 sequencer.c                      | 21 +++++++++-----
 t/t0028-working-tree-encoding.sh |  4 +--
 t/t3900-i18n-commit.sh           | 42 +++++++++++++++++++++++++++
 4 files changed, 107 insertions(+), 9 deletions(-)
Range-diff against v2:
1:  8b30028425 ! 1:  b3d6c4e720 t0028: eliminate non-standard usage of printf
    @@ Commit message
            one, two, or three-digit octal number, shall be written as a byte
            with the numeric value specified by the octal number.
     
    -    printf '\xfe\xff' in an extension of some shell.
    +    printf '\xfe\xff' is an extension of some shell.
         Dash, a popular yet simple shell, do not implement this extension.
     
         This wasn't caught by most people running the tests, even though
2:  7c2c6f0603 ! 2:  f07566c60c configure.ac: define ICONV_OMITS_BOM if necessary
    @@ Commit message
     
         However, typing the flag all the time is cumbersome and error-prone.
     
    -    Add a checking into configure script to detect this flag automatically.
    +    Add a check into configure script to detect this flag automatically.
     
         Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
     
-:  ---------- > 3:  662e5bd545 t3900: demonstrate git-rebase problem with multi encoding
3:  b7927b2723 ! 4:  6a51fdd29c sequencer: reencode to utf-8 before arrange rebase's todo list
    @@ Commit message
         first, then format it and convert the message to the actual output
         encoding on git commit --squash.
     
    -    Thus, t3900 is failing on Linux with musl libc.
    -
    -    This problem wasn't specific to musl libc. On Linux with glibc, this
    -    problem can be observed by:
    -
    -    for encoding in utf-8 iso-8859-1; do
    -            # commit using the encoding
    -            echo $encoding >file && git add file
    -            echo "éñcödèd with $encoding" | iconv -f utf-8 -t $encoding |
    -              git -c i18n.commitEncoding=$encoding commit -F -
    -            # and then fixup without it
    -            echo "$encoding fixed" >file && git add file
    -            git commit --fixup HEAD
    -    done
    -    git rebase -i --autosquash --root
    +    Thus, t3900::test_commit_autosquash_flags is failing on musl libc.
     
         Reencode to utf-8 before arranging rebase's todo list.
    +    By doing this, we also remove a breakage introduced in the previous
    +    commit.
     
         Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
     
    @@ sequencer.c: int todo_list_rearrange_squash(struct todo_list *todo_list)
      		find_commit_subject(commit_buffer, &subject);
      		format_subject(&buf, subject, " ");
      		subject = subjects[i] = strbuf_detach(&buf, &subject_len);
    +
    + ## t/t3900-i18n-commit.sh ##
    +@@ t/t3900-i18n-commit.sh: test_commit_autosquash_multi_encoding () {
    + 	old=$2
    + 	new=$3
    + 	msg=$4
    +-	test_expect_failure "commit --$flag into $old from $new" '
    ++	test_expect_success "commit --$flag into $old from $new" '
    + 		git checkout -b '$flag-$old-$new' C0 &&
    + 		git config i18n.commitencoding '$old' &&
    + 		echo '$old' >>F &&
-:  ---------- > 5:  d382e35e4e sequencer: reencode revert/cherry-pick's todo list
-:  ---------- > 6:  340902eb67 sequencer: reencode squashing commit's message
-:  ---------- > 7:  7f0df0f685 sequencer: reencode old merge-commit message
-:  ---------- > 8:  69ec40bb1d sequencer: reencode commit message for am/rebase --show-current-patch
-- 
2.24.0.4.g6a51fdd29c
Previous: Jeff KingNext: Doan Tran Cong Danh
Message 29 of 89 in “Linux with musl libc improvement”
  1. 0/3 Linux with musl libc improvementDoan Tran Cong Danh, Oct 31, 2019
  2. 1/3 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Oct 31, 2019
  3. Jeff KingOct 31, 2019
  4. Danh DoanNov 1, 2019
  5. brian m. carlsonOct 31, 2019
  6. 2/3 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Oct 31, 2019
  7. Jeff KingOct 31, 2019
  8. brian m. carlsonOct 31, 2019
  9. Danh DoanNov 1, 2019
  10. 3/3 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Oct 31, 2019
  11. Johannes SchindelinOct 31, 2019
  12. Jeff KingOct 31, 2019
  13. Danh DoanNov 1, 2019
  14. 0/3 Linux with musl libc improvementDoan Tran Cong Danh, Nov 1, 2019
  15. 1/3 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 1, 2019
  16. Jeff KingNov 1, 2019
  17. 2/3 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 1, 2019
  18. Jeff KingNov 1, 2019
  19. Danh DoanNov 2, 2019
  20. 3/3 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 1, 2019
  21. Jeff KingNov 1, 2019
  22. Danh DoanNov 2, 2019
  23. Danh DoanNov 2, 2019
  24. Jeff KingNov 5, 2019
  25. Junio C HamanoNov 6, 2019
  26. Jeff KingNov 6, 2019
  27. Danh DoanNov 6, 2019
  28. Jeff KingNov 7, 2019
  29. 0/8 Correct internal working and output encodingDoan Tran Cong Danh, Nov 6, 2019
  30. 1/8 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 6, 2019
  31. 2/8 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 6, 2019
  32. 3/8 t3900: demonstrate git-rebase problem with multi encodingDoan Tran Cong Danh, Nov 6, 2019
  33. 4/8 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 6, 2019
  34. 5/8 sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh, Nov 6, 2019
  35. 6/8 sequencer: reencode squashing commit's messageDoan Tran Cong Danh, Nov 6, 2019
  36. 7/8 sequencer: reencode old merge-commit messageDoan Tran Cong Danh, Nov 6, 2019
  37. Eric SunshineNov 6, 2019
  38. 8/8 sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh, Nov 6, 2019
  39. 0/8 Correct internal working and output encodingDoan Tran Cong Danh, Nov 7, 2019
  40. 1/8 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 7, 2019
  41. 2/8 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 7, 2019
  42. Junio C HamanoNov 7, 2019
  43. 3/8 t3900: demonstrate git-rebase problem with multi encodingDoan Tran Cong Danh, Nov 7, 2019
  44. Jeff KingNov 7, 2019
  45. Danh DoanNov 7, 2019
  46. Jeff KingNov 7, 2019
  47. Danh DoanNov 7, 2019
  48. Jeff KingNov 11, 2019
  49. 4/8 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 7, 2019
  50. Jeff KingNov 7, 2019
  51. 6/8 sequencer: reencode squashing commit's messageDoan Tran Cong Danh, Nov 7, 2019
  52. Jeff KingNov 7, 2019
  53. 5/8 sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh, Nov 7, 2019
  54. Jeff KingNov 7, 2019
  55. 7/8 sequencer: reencode old merge-commit messageDoan Tran Cong Danh, Nov 7, 2019
  56. 8/8 sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh, Nov 7, 2019
  57. Jeff KingNov 7, 2019
  58. Danh DoanNov 7, 2019
  59. Jeff KingNov 7, 2019
  60. Danh DoanNov 7, 2019
  61. 0/9 Improve odd encoding integrationDoan Tran Cong Danh, Nov 8, 2019
  62. 1/9 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 8, 2019
  63. 2/9 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 8, 2019
  64. 4/9 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 8, 2019
  65. 3/9 t3900: demonstrate git-rebase problem with multi encodingDoan Tran Cong Danh, Nov 8, 2019
  66. 5/9 sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh, Nov 8, 2019
  67. 6/9 sequencer: reencode squashing commit's messageDoan Tran Cong Danh, Nov 8, 2019
  68. 7/9 sequencer: reencode old merge-commit messageDoan Tran Cong Danh, Nov 8, 2019
  69. 8/9 sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh, Nov 8, 2019
  70. 9/9 sequencer: fallback to sane label in making rebase todo listDoan Tran Cong Danh, Nov 8, 2019
  71. Junio C HamanoNov 11, 2019
  72. Junio C HamanoNov 11, 2019
  73. Danh DoanNov 11, 2019
  74. Junio C HamanoNov 11, 2019
  75. 0/9 sequencer: handle other encoding betterDoan Tran Cong Danh, Nov 11, 2019
  76. 1/9 t0028: eliminate non-standard usage of printfDoan Tran Cong Danh, Nov 11, 2019
  77. 2/9 configure.ac: define ICONV_OMITS_BOM if necessaryDoan Tran Cong Danh, Nov 11, 2019
  78. 3/9 t3900: demonstrate git-rebase problem with multi encodingDoan Tran Cong Danh, Nov 11, 2019
  79. 4/9 sequencer: reencode to utf-8 before arrange rebase's todo listDoan Tran Cong Danh, Nov 11, 2019
  80. 5/9 sequencer: reencode revert/cherry-pick's todo listDoan Tran Cong Danh, Nov 11, 2019
  81. 6/9 sequencer: reencode squashing commit's messageDoan Tran Cong Danh, Nov 11, 2019
  82. 8/9 sequencer: reencode commit message for am/rebase --show-current-patchDoan Tran Cong Danh, Nov 11, 2019
  83. 7/9 sequencer: reencode old merge-commit messageDoan Tran Cong Danh, Nov 11, 2019
  84. 9/9 sequencer: fallback to sane label in making rebase todo listDoan Tran Cong Danh, Nov 11, 2019
  85. Jeff KingNov 11, 2019
  86. Phillip WoodNov 11, 2019
  87. Johannes SchindelinNov 11, 2019
  88. Junio C HamanoNov 12, 2019
  89. Jeff KingNov 11, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.