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

[PATCH v2 06/12] pretty: get the correct encoding for --pretty:format=%e

From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date
Mar 30, 2013, 09:35 UTC
Message-ID
<1364636112-15065-7-git-send-email-pclouds@gmail.com>
In-Reply-To
<1364636112-15065-1-git-send-email-pclouds@gmail.com>

parse_commit_header() provides the commit encoding for '%e' and it reads it from the re-encoded message, which contains the new encoding, not the original one in the commit object.

Get the commit encoding from logmsg_reencode() instead.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 pretty.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/pretty.c b/pretty.c
index ab5d70f..e2241e5 100644
--- a/pretty.c
+++ b/pretty.c
@@ -771,12 +771,12 @@ struct format_commit_context {
 		char *signer;
 	} signature;
 	char *message;
+	char *commit_encoding;
 	size_t width, indent1, indent2;
 
 	/* These offsets are relative to the start of the commit message. */
 	struct chunk author;
 	struct chunk committer;
-	struct chunk encoding;
 	size_t message_off;
 	size_t subject_off;
 	size_t body_off;
@@ -823,9 +823,6 @@ static void parse_commit_header(struct format_commit_context *context)
 		} else if (!prefixcmp(msg + i, "committer ")) {
 			context->committer.off = i + 10;
 			context->committer.len = eol - i - 10;
-		} else if (!prefixcmp(msg + i, "encoding ")) {
-			context->encoding.off = i + 9;
-			context->encoding.len = eol - i - 9;
 		}
 		i = eol;
 	}
@@ -1210,7 +1207,8 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder,
 				   msg + c->committer.off, c->committer.len,
 				   c->pretty_ctx->date_mode);
 	case 'e':	/* encoding */
-		strbuf_add(sb, msg + c->encoding.off, c->encoding.len);
+		if (c->commit_encoding)
+			strbuf_addstr(sb, c->commit_encoding);
 		return 1;
 	case 'B':	/* raw body */
 		/* message_off is always left at the initial newline */
@@ -1321,11 +1319,14 @@ void format_commit_message(const struct commit *commit,
 	context.commit = commit;
 	context.pretty_ctx = pretty_ctx;
 	context.wrap_start = sb->len;
-	context.message = logmsg_reencode(commit, NULL, output_enc);
+	context.message = logmsg_reencode(commit,
+					  &context.commit_encoding,
+					  output_enc);
 
 	strbuf_expand(sb, format, format_commit_item, &context);
 	rewrap_message_tail(sb, &context, 0, 0, 0);
 
+	free(context.commit_encoding);
 	logmsg_free(context.message, commit);
 	free(context.signature.gpg_output);
 	free(context.signature.signer);

-- 
1.8.2.83.gc99314b
Previous: Junio C HamanoNext: Nguyễn Thái Ngọc Duy
Message 32 of 83 in “Layout control placeholders for pretty format”
  1. 00/12 Layout control placeholders for pretty formatNguyễn Thái Ngọc Duy, Mar 16, 2013
  2. 01/12 pretty-formats.txt: wrap long linesNguyễn Thái Ngọc Duy, Mar 16, 2013
  3. 02/12 pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy, Mar 16, 2013
  4. 03/12 utf8.c: move display_mode_esc_sequence_len() for use by other functionsNguyễn Thái Ngọc Duy, Mar 16, 2013
  5. 04/12 utf8.c: add utf8_strnwidth() with the ability to skip ansi sequencesNguyễn Thái Ngọc Duy, Mar 16, 2013
  6. 05/12 pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy, Mar 16, 2013
  7. Eric SunshineMar 17, 2013
  8. 06/12 pretty: get the correct encoding for --pretty:format=%eNguyễn Thái Ngọc Duy, Mar 16, 2013
  9. 07/12 utf8: keep NULs in reencode_string()Nguyễn Thái Ngọc Duy, Mar 16, 2013
  10. 08/12 pretty: two phase conversion for non utf-8 commitsNguyễn Thái Ngọc Duy, Mar 16, 2013
  11. 09/12 pretty: add %C(auto) for auto-coloring on the next placeholderNguyễn Thái Ngọc Duy, Mar 16, 2013
  12. Eric SunshineMar 17, 2013
  13. 10/12 pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy, Mar 16, 2013
  14. Eric SunshineMar 17, 2013
  15. 11/12 pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy, Mar 16, 2013
  16. Paul CampbellMar 16, 2013
  17. 12/12 pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy, Mar 16, 2013
  18. Eric SunshineMar 17, 2013
  19. Duy NguyenMar 30, 2013
  20. 00/12 Layout control placeholders for pretty formatNguyễn Thái Ngọc Duy, Mar 30, 2013
  21. 01/12 pretty-formats.txt: wrap long linesNguyễn Thái Ngọc Duy, Mar 30, 2013
  22. 02/12 pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy, Mar 30, 2013
  23. Junio C HamanoApr 1, 2013
  24. Jakub NarębskiApr 5, 2013
  25. Duy NguyenApr 12, 2013
  26. Duy NguyenApr 12, 2013
  27. 03/12 utf8.c: move display_mode_esc_sequence_len() for use by other functionsNguyễn Thái Ngọc Duy, Mar 30, 2013
  28. 04/12 utf8.c: add utf8_strnwidth() with the ability to skip ansi sequencesNguyễn Thái Ngọc Duy, Mar 30, 2013
  29. Junio C HamanoApr 1, 2013
  30. 05/12 pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy, Mar 30, 2013
  31. Junio C HamanoApr 1, 2013
  32. 06/12 pretty: get the correct encoding for --pretty:format=%eNguyễn Thái Ngọc Duy, Mar 30, 2013
  33. 07/12 utf8: keep NULs in reencode_string()Nguyễn Thái Ngọc Duy, Mar 30, 2013
  34. Torsten BögershausenMar 30, 2013
  35. Duy NguyenMar 31, 2013
  36. 08/12 pretty: two phase conversion for non utf-8 commitsNguyễn Thái Ngọc Duy, Mar 30, 2013
  37. 09/12 pretty: add %C(auto) for auto-coloring on the next placeholderNguyễn Thái Ngọc Duy, Mar 30, 2013
  38. Junio C HamanoApr 1, 2013
  39. Duy NguyenApr 5, 2013
  40. Junio C HamanoApr 5, 2013
  41. Duy NguyenApr 15, 2013
  42. 10/12 pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy, Mar 30, 2013
  43. 11/12 pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy, Mar 30, 2013
  44. 12/12 pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy, Mar 30, 2013
  45. Junio C HamanoApr 1, 2013
  46. 00/13 nd/pretty-formatsNguyễn Thái Ngọc Duy, Apr 16, 2013
  47. 01/13 pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy, Apr 16, 2013
  48. 02/13 pretty: get the correct encoding for --pretty:format=%eNguyễn Thái Ngọc Duy, Apr 16, 2013
  49. 03/13 pretty-formats.txt: wrap long linesNguyễn Thái Ngọc Duy, Apr 16, 2013
  50. 04/13 pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy, Apr 16, 2013
  51. 05/13 utf8.c: move display_mode_esc_sequence_len() for use by other functionsNguyễn Thái Ngọc Duy, Apr 16, 2013
  52. 06/13 utf8.c: add utf8_strnwidth() with the ability to skip ansi sequencesNguyễn Thái Ngọc Duy, Apr 16, 2013
  53. 07/13 utf8.c: add reencode_string_len() that can handle NULs in stringNguyễn Thái Ngọc Duy, Apr 16, 2013
  54. Duy NguyenApr 16, 2013
  55. Junio C HamanoApr 18, 2013
  56. 08/13 pretty: two phase conversion for non utf-8 commitsNguyễn Thái Ngọc Duy, Apr 16, 2013
  57. 09/13 pretty: split color parsing into a separate functionNguyễn Thái Ngọc Duy, Apr 16, 2013
  58. 10/13 pretty: add %C(auto) for auto-coloringNguyễn Thái Ngọc Duy, Apr 16, 2013
  59. Junio C HamanoApr 16, 2013
  60. Duy NguyenApr 17, 2013
  61. Junio C HamanoApr 17, 2013
  62. Junio C HamanoApr 16, 2013
  63. 11/13 pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy, Apr 16, 2013
  64. Junio C HamanoApr 16, 2013
  65. Junio C HamanoApr 16, 2013
  66. Duy NguyenApr 17, 2013
  67. 12/13 pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy, Apr 16, 2013
  68. 13/13 pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy, Apr 16, 2013
  69. 00/13 nd/pretty-formatsNguyễn Thái Ngọc Duy, Apr 18, 2013
  70. 01/13 pretty: save commit encoding from logmsg_reencode if the caller needs itNguyễn Thái Ngọc Duy, Apr 18, 2013
  71. 02/13 pretty: get the correct encoding for --pretty:format=%eNguyễn Thái Ngọc Duy, Apr 18, 2013
  72. 03/13 pretty-formats.txt: wrap long linesNguyễn Thái Ngọc Duy, Apr 18, 2013
  73. 04/13 pretty: share code between format_decoration and show_decorationsNguyễn Thái Ngọc Duy, Apr 18, 2013
  74. 05/13 utf8.c: move display_mode_esc_sequence_len() for use by other functionsNguyễn Thái Ngọc Duy, Apr 18, 2013
  75. 06/13 utf8.c: add utf8_strnwidth() with the ability to skip ansi sequencesNguyễn Thái Ngọc Duy, Apr 18, 2013
  76. 07/13 utf8.c: add reencode_string_len() that can handle NULs in stringNguyễn Thái Ngọc Duy, Apr 18, 2013
  77. 08/13 pretty: two phase conversion for non utf-8 commitsNguyễn Thái Ngọc Duy, Apr 18, 2013
  78. 09/13 pretty: split color parsing into a separate functionNguyễn Thái Ngọc Duy, Apr 18, 2013
  79. 10/13 pretty: add %C(auto) for auto-coloringNguyễn Thái Ngọc Duy, Apr 18, 2013
  80. 11/13 pretty: support padding placeholders, %< %> and %><Nguyễn Thái Ngọc Duy, Apr 18, 2013
  81. 12/13 pretty: support truncating in %>, %< and %><Nguyễn Thái Ngọc Duy, Apr 18, 2013
  82. 13/13 pretty: support %>> that steal trailing spacesNguyễn Thái Ngọc Duy, Apr 18, 2013
  83. Torsten BögershausenApr 16, 2013

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.