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

[PATCH v2 0/3] Linux with musl libc improvement

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

This series of patch tries to ease the life of musl libc user and clear those last failure on Linux with musl libc.

The second patch is a complete rewrite.
Doan Tran Cong Danh (3):
  t0028: eliminate non-standard usage of printf
  configure.ac: define ICONV_OMITS_BOM if necessary
  sequencer: reencode to utf-8 before arrange rebase's todo list
 configure.ac                     | 49 ++++++++++++++++++++++++++++++++
 sequencer.c                      |  2 +-
 t/t0028-working-tree-encoding.sh |  4 +--
 3 files changed, 52 insertions(+), 3 deletions(-)
Range-diff against v1:
1:  840c40cea1 ! 1:  8b30028425 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 libc.
    +    printf '\xfe\xff' in an extension of some shell.
    +    Dash, a popular yet simple shell, do not implement this extension.
     
    -    With dash:
    -    $ printf '\xfe\xff' | xxd
    -    00000000: 5c78 6665 5c78 6666                      \xfe\xff
    +    This wasn't caught by most people running the tests, even though
    +    common shells like dash don't handle hex escapes, because their
    +    systems don't trigger the NO_UTF16_BOM prereq. But systems with musl
    +    libc do; when combined with dash, the test fails.
     
    -    Correct its usage.
    +    Correct it.
     
         Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
    -    Despite that dash's printf doesn't accept \x escape sequence.
    -
    -    My glibc box (with sh linked to dash) can run the test just fine.
    -    But my musl box couldn't run the test, (because the header).
     
      ## t/t0028-working-tree-encoding.sh ##
     @@ t/t0028-working-tree-encoding.sh: test_lazy_prereq NO_UTF32_BOM '
2:  4a28ee7ef6 < -:  ---------- configure.ac: define ICONV_OMITS_BOM if necessary
-:  ---------- > 2:  7c2c6f0603 configure.ac: define ICONV_OMITS_BOM if necessary
3:  c8da3990e5 ! 3:  b7927b2723 sequencer: reencode to utf-8 before arrange rebase's todo list
    @@ Commit message
     
         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
    +
         Reencode to utf-8 before arranging rebase's todo list.
     
         Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
    -    The todo list shown to user has already been reencoded by sequencer_make_script,
    -    without this patch it looks like this:
    -
    -    $ head -3 .git/rebase-merge/git-rebase-todo | xxd
    -    00000000: 7069 636b 2065 6633 3961 3033 201b 2442  pick ef39a03 .$B
    -    00000010: 244f 1b28 421b 2442 246c 1b28 421b 2442  $O.(B.$B$l.(B.$B
    -    00000020: 2452 1b28 421b 2442 245b 1b28 421b 2442  $R.(B.$B$[.(B.$B
    -    00000030: 2455 1b28 420a 7069 636b 2062 3832 3931  $U.(B.pick b8291
    -    00000040: 3336 2073 7175 6173 6821 201b 2442 244f  36 squash! .$B$O
    -    00000050: 1b28 421b 2442 246c 1b28 421b 2442 2452  .(B.$B$l.(B.$B$R
    -    00000060: 1b28 421b 2442 245b 1b28 421b 2442 2455  .(B.$B$[.(B.$B$U
    -    00000070: 1b28 420a 7069 636b 2062 3532 3132 6437  .(B.pick b5212d7
    -    00000080: 2069 6e74 6572 6d65 6469 6174 6520 636f   intermediate co
    -    00000090: 6d6d 6974 0a                             mmit.
     
      ## sequencer.c ##
     @@ sequencer.c: int todo_list_rearrange_squash(struct todo_list *todo_list)
-- 
2.24.0.rc2.296.geaf699fcc3
Previous: Danh DoanNext: Doan Tran Cong Danh
Message 14 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.