From: Jeff King <peff@peff.net>
To: Doan Tran Cong Danh <congdanhqx@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v4 8/8] sequencer: reencode commit message for am/rebase --show-current-patch
Date: Thu, 7 Nov 2019 01:32:23 -0500 [thread overview]
Message-ID: <20191107063223.GF6431@sigill.intra.peff.net> (raw)
In-Reply-To: <36796e2b679cd8b2d341058e775db401f9abcef7.1573094789.git.congdanhqx@gmail.com>
On Thu, Nov 07, 2019 at 09:56:19AM +0700, Doan Tran Cong Danh wrote:
> The message file will be used as commit message for the
> git-{am,rebase} --continue.
>
> [...]
> strbuf_addf(&buf, "%s/message", get_dir(opts));
> if (!file_exists(buf.buf)) {
> - const char *commit_buffer = get_commit_buffer(commit, NULL);
> + const char *encoding = get_commit_output_encoding();
> + const char *commit_buffer = logmsg_reencode(commit, NULL, encoding);
That makes sense, though it's hard to understand the flow of this data
through multiple sequencer invocations. I _think_ this would be fixing a
case like this:
-- >8 --
git init repo
cd repo
# some commits to build off of
echo base >file
git add file
git commit -m base
echo side >file
git add file
git commit -m side
# now make a commit in iso8859-1
git checkout -b side HEAD^
echo iso8859-1 >file
git add file
iconv -f utf8 -t iso8859-1 <<-\EOF |
súbject
bödy
EOF
git -c i18n.commitEncoding=iso8859-1 commit -F -
# and rebase it with the merge strategy, which will fail;
# now .git/rebase-merge/message has iso8859-1 in it
git rebase -m master
# and if we resolve and commit, presumably we'd get a broken commit,
# with iso8859-1 and no encoding header
echo resolved >file
git add file
GIT_EDITOR=: git rebase --continue
-- 8< --
But somehow it all seems to work. The resulting commit has real utf8 in
it. I'm not sure if we pull it from the original commit via "commit -c",
or if it's in one of the other files. But it's not clear to me how
this "message" file is being used.
-Peff
next prev parent reply other threads:[~2019-11-07 6:32 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 ` [PATCH v2 0/3] Linux with musl libc improvement Doan Tran Cong Danh
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 [this message]
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=20191107063223.GF6431@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=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).