]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/git.txt
Merge branch 'jk/core-comment-string'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Apr 2024 17:49:49 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Apr 2024 17:49:49 +0000 (10:49 -0700)
commitdce1e0b6daaa872a3b88724d9aa1b087c95e8754
tree9553fe603130f7aa2617854320ba23601887149b
parent3256584c36f649abb2af58e7b190d3cf674ba56e
parent9ccf3e9b22b6843892319b189fd7aed37c451420
Merge branch 'jk/core-comment-string'

core.commentChar used to be limited to a single byte, but has been
updated to allow an arbitrary multi-byte sequence.

* jk/core-comment-string:
  config: add core.commentString
  config: allow multi-byte core.commentChar
  environment: drop comment_line_char compatibility macro
  wt-status: drop custom comment-char stringification
  sequencer: handle multi-byte comment characters when writing todo list
  find multi-byte comment chars in unterminated buffers
  find multi-byte comment chars in NUL-terminated strings
  prefer comment_line_str to comment_line_char for printing
  strbuf: accept a comment string for strbuf_add_commented_lines()
  strbuf: accept a comment string for strbuf_commented_addf()
  strbuf: accept a comment string for strbuf_stripspace()
  environment: store comment_line_char as a string
  strbuf: avoid shadowing global comment_line_char name
  commit: refactor base-case of adjust_comment_line_char()
  strbuf: avoid static variables in strbuf_add_commented_lines()
  strbuf: simplify comment-handling in add_lines() helper
  config: forbid newline as core.commentChar
17 files changed:
builtin/am.c
builtin/branch.c
builtin/commit.c
builtin/merge.c
builtin/rebase.c
builtin/tag.c
builtin/worktree.c
commit.c
config.c
environment.c
environment.h
sequencer.c
strbuf.c
strbuf.h
t/t7508-status.sh
trailer.c
wt-status.c