From: Doan Tran Cong Danh <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: Doan Tran Cong Danh <congdanhqx@gmail.com>
Subject: [PATCH v2 0/3] Linux with musl libc improvement
Date: Fri, 1 Nov 2019 15:25:08 +0700 [thread overview]
Message-ID: <cover.1572596278.git.congdanhqx@gmail.com> (raw)
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
next prev parent reply other threads:[~2019-11-01 8:25 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 9:26 [PATCH 0/3] Linux with musl libc improvement Doan Tran Cong Danh
2019-10-31 9:26 ` [PATCH 1/3] t0028: eliminate non-standard usage of printf Doan Tran Cong Danh
2019-10-31 17:41 ` Jeff King
2019-11-01 1:33 ` Danh Doan
2019-10-31 19:50 ` brian m. carlson
2019-10-31 9:26 ` [PATCH 2/3] configure.ac: define ICONV_OMITS_BOM if necessary Doan Tran Cong Danh
2019-10-31 18:11 ` Jeff King
2019-10-31 20:02 ` brian m. carlson
2019-11-01 1:40 ` Danh Doan
2019-10-31 9:26 ` [PATCH 3/3] sequencer: reencode to utf-8 before arrange rebase's todo list Doan Tran Cong Danh
2019-10-31 10:38 ` Johannes Schindelin
2019-10-31 19:26 ` Jeff King
2019-11-01 4:49 ` Danh Doan
2019-11-01 8:25 ` Doan Tran Cong Danh [this message]
2019-11-01 8:25 ` [PATCH v2 1/3] t0028: eliminate non-standard usage of printf Doan Tran Cong Danh
2019-11-01 16:54 ` Jeff King
2019-11-01 8:25 ` [PATCH v2 2/3] configure.ac: define ICONV_OMITS_BOM if necessary Doan Tran Cong Danh
2019-11-01 16:56 ` Jeff King
2019-11-02 0:43 ` Danh Doan
2019-11-01 8:25 ` [PATCH v2 3/3] sequencer: reencode to utf-8 before arrange rebase's todo list Doan Tran Cong Danh
2019-11-01 16:59 ` Jeff King
2019-11-02 1:02 ` Danh Doan
2019-11-02 12:20 ` Danh Doan
2019-11-05 8:00 ` Jeff King
2019-11-06 1:30 ` Junio C Hamano
2019-11-06 4:03 ` Jeff King
2019-11-06 10:03 ` Danh Doan
2019-11-07 5:56 ` Jeff King
2019-11-06 9:19 ` [PATCH v3 0/8] Correct internal working and output encoding Doan Tran Cong Danh
2019-11-06 9:19 ` [PATCH v3 1/8] t0028: eliminate non-standard usage of printf Doan Tran Cong Danh
2019-11-06 9:20 ` [PATCH v3 2/8] configure.ac: define ICONV_OMITS_BOM if necessary Doan Tran Cong Danh
2019-11-06 9:20 ` [PATCH v3 3/8] t3900: demonstrate git-rebase problem with multi encoding Doan Tran Cong Danh
2019-11-06 9:20 ` [PATCH v3 4/8] sequencer: reencode to utf-8 before arrange rebase's todo list Doan Tran Cong Danh
2019-11-06 9:20 ` [PATCH v3 5/8] sequencer: reencode revert/cherry-pick's " Doan Tran Cong Danh
2019-11-06 9:20 ` [PATCH v3 6/8] sequencer: reencode squashing commit's message Doan Tran Cong Danh
2019-11-06 9:20 ` [PATCH v3 7/8] sequencer: reencode old merge-commit message Doan Tran Cong Danh
2019-11-06 15:39 ` Eric Sunshine
2019-11-06 9:20 ` [PATCH v3 8/8] sequencer: reencode commit message for am/rebase --show-current-patch Doan Tran Cong Danh
2019-11-07 2:56 ` [PATCH v4 0/8] Correct internal working and output encoding Doan Tran Cong Danh
2019-11-07 2:56 ` [PATCH v4 1/8] t0028: eliminate non-standard usage of printf Doan Tran Cong Danh
2019-11-07 2:56 ` [PATCH v4 2/8] configure.ac: define ICONV_OMITS_BOM if necessary Doan Tran Cong Danh
2019-11-07 6:18 ` Junio C Hamano
2019-11-07 2:56 ` [PATCH v4 3/8] t3900: demonstrate git-rebase problem with multi encoding Doan Tran Cong Danh
2019-11-07 6:02 ` Jeff King
2019-11-07 6:48 ` Danh Doan
2019-11-07 8:02 ` Jeff King
2019-11-07 10:51 ` Danh Doan
2019-11-11 8:22 ` Jeff King
2019-11-07 2:56 ` [PATCH v4 4/8] sequencer: reencode to utf-8 before arrange rebase's todo list Doan Tran Cong Danh
2019-11-07 6:04 ` Jeff King
2019-11-07 2:56 ` [PATCH v4 5/8] sequencer: reencode revert/cherry-pick's " Doan Tran Cong Danh
2019-11-07 6:06 ` Jeff King
2019-11-07 2:56 ` [PATCH v4 6/8] sequencer: reencode squashing commit's message Doan Tran Cong Danh
2019-11-07 6:15 ` Jeff King
2019-11-07 2:56 ` [PATCH v4 7/8] sequencer: reencode old merge-commit message Doan Tran Cong Danh
2019-11-07 2:56 ` [PATCH v4 8/8] sequencer: reencode commit message for am/rebase --show-current-patch Doan Tran Cong Danh
2019-11-07 6:32 ` Jeff King
2019-11-07 7:48 ` Danh Doan
2019-11-07 8:03 ` Jeff King
2019-11-07 16:32 ` Danh Doan
2019-11-08 9:43 ` [PATCH v5 0/9] Improve odd encoding integration Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 1/9] t0028: eliminate non-standard usage of printf Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 2/9] configure.ac: define ICONV_OMITS_BOM if necessary Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 3/9] t3900: demonstrate git-rebase problem with multi encoding Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 4/9] sequencer: reencode to utf-8 before arrange rebase's todo list Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 5/9] sequencer: reencode revert/cherry-pick's " Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 6/9] sequencer: reencode squashing commit's message Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 7/9] sequencer: reencode old merge-commit message Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 8/9] sequencer: reencode commit message for am/rebase --show-current-patch Doan Tran Cong Danh
2019-11-08 9:43 ` [PATCH v5 9/9] sequencer: fallback to sane label in making rebase todo list Doan Tran Cong Danh
2019-11-11 1:22 ` [PATCH v5 0/9] Improve odd encoding integration Junio C Hamano
2019-11-11 4:02 ` Junio C Hamano
2019-11-11 4:43 ` Danh Doan
2019-11-11 6:14 ` Junio C Hamano
2019-11-11 6:03 ` [PATCH v6 0/9] sequencer: handle other encoding better Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 1/9] t0028: eliminate non-standard usage of printf Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 2/9] configure.ac: define ICONV_OMITS_BOM if necessary Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 3/9] t3900: demonstrate git-rebase problem with multi encoding Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 4/9] sequencer: reencode to utf-8 before arrange rebase's todo list Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 5/9] sequencer: reencode revert/cherry-pick's " Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 6/9] sequencer: reencode squashing commit's message Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 7/9] sequencer: reencode old merge-commit message Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 8/9] sequencer: reencode commit message for am/rebase --show-current-patch Doan Tran Cong Danh
2019-11-11 6:03 ` [PATCH v6 9/9] sequencer: fallback to sane label in making rebase todo list Doan Tran Cong Danh
2019-11-11 8:39 ` Jeff King
2019-11-11 16:22 ` Phillip Wood
2019-11-11 18:26 ` Johannes Schindelin
2019-11-12 4:17 ` Junio C Hamano
2019-11-11 8:40 ` [PATCH v6 0/9] sequencer: handle other encoding better Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1572596278.git.congdanhqx@gmail.com \
--to=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).