From: Doan Tran Cong Danh <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: Doan Tran Cong Danh <congdanhqx@gmail.com>
Subject: [PATCH v3 6/8] sequencer: reencode squashing commit's message
Date: Wed, 6 Nov 2019 16:20:04 +0700 [thread overview]
Message-ID: <340902eb67df7e9a5ecb9e085f5e3fcaa1fd6751.1573031848.git.congdanhqx@gmail.com> (raw)
In-Reply-To: <cover.1573031848.git.congdanhqx@gmail.com>
On fixup/squash-ing rebase, git will create new commit in
i18n.commitencoding, reencode the commit message to that said encode.
Signed-off-by: Doan Tran Cong Danh <congdanhqx@gmail.com>
---
sequencer.c | 8 +++++---
t/t3900-i18n-commit.sh | 14 +++++++++++++-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index a19954f2bf..833a928929 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1576,6 +1576,7 @@ static int update_squash_messages(struct repository *r,
struct strbuf buf = STRBUF_INIT;
int res;
const char *message, *body;
+ const char *encoding = get_commit_output_encoding();
if (opts->current_fixup_count > 0) {
struct strbuf header = STRBUF_INIT;
@@ -1602,7 +1603,7 @@ static int update_squash_messages(struct repository *r,
return error(_("need a HEAD to fixup"));
if (!(head_commit = lookup_commit_reference(r, &head)))
return error(_("could not read HEAD"));
- if (!(head_message = get_commit_buffer(head_commit, NULL)))
+ if (!(head_message = logmsg_reencode(head_commit, NULL, encoding)))
return error(_("could not read HEAD's commit message"));
find_commit_subject(head_message, &body);
@@ -1623,7 +1624,7 @@ static int update_squash_messages(struct repository *r,
unuse_commit_buffer(head_commit, head_message);
}
- if (!(message = get_commit_buffer(commit, NULL)))
+ if (!(message = logmsg_reencode(commit, NULL, encoding)))
return error(_("could not read commit message of %s"),
oid_to_hex(&commit->object.oid));
find_commit_subject(message, &body);
@@ -4154,9 +4155,10 @@ static int commit_staged_changes(struct repository *r,
*/
struct commit *commit;
const char *path = rebase_path_squash_msg();
+ const char *encoding = get_commit_output_encoding();
if (parse_head(r, &commit) ||
- !(p = get_commit_buffer(commit, NULL)) ||
+ !(p = logmsg_reencode(commit, NULL, encoding)) ||
write_message(p, strlen(p), path, 0)) {
unuse_commit_buffer(commit, p);
return error(_("could not write file: "
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 7501555c52..241bda1099 100755
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -209,6 +209,13 @@ test_commit_autosquash_multi_encoding () {
old=$2
new=$3
msg=$4
+ squash_msg=
+ if test $flag = squash; then
+ squash_msg='
+ subject="squash! $(head -1 expect)" &&
+ printf "\n%s\n" "$subject" >> expect &&
+ '
+ fi
test_expect_success "commit --$flag into $old from $new" '
git checkout -b '$flag-$old-$new' C0 &&
git config i18n.commitencoding '$old' &&
@@ -225,7 +232,12 @@ test_commit_autosquash_multi_encoding () {
git config --unset-all i18n.commitencoding &&
git rebase --autosquash -i HEAD^^^ &&
git rev-list HEAD >actual &&
- test_line_count = 3 actual
+ test_line_count = 3 actual &&
+ iconv -f '$old' -t utf-8 "$TEST_DIRECTORY/t3900/'$msg'" >expect &&
+ '"$squash_msg"'
+ git cat-file commit HEAD^ >raw &&
+ (sed "1,/^$/d" raw | iconv -f '$new' -t utf-8) >actual &&
+ test_cmp expect actual
'
}
--
2.24.0.4.g6a51fdd29c
next prev parent reply other threads:[~2019-11-06 9:20 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 ` Doan Tran Cong Danh [this message]
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=340902eb67df7e9a5ecb9e085f5e3fcaa1fd6751.1573031848.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).