diff options
| author |  Doan Tran Cong Danh <congdanhqx@gmail.com> | 2019-11-08 16:43:48 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-11-11 09:43:48 +0900 |
| commit | b375744274113889c85bee69445375ce51e96648 (patch) | |
| tree | 8299570133bb261f76b119a98c24c68333b76e42 /sequencer.c | |
| parent | sequencer: reencode revert/cherry-pick's todo list (diff) | |
| download | tgif-b375744274113889c85bee69445375ce51e96648.tar.xz | |
sequencer: reencode squashing commit's message
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 8 |
1 files changed, 5 insertions, 3 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: " |