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

[PATCH v3 4/9] doc: notes: rework --[no-]stripspace

From
Kkristofferhaugsbakk@fastmail.com <kristofferhaugsbakk@fastmail.com>
Date
May 27, 2025, 21:19 UTC
Message-ID
<c68a91f81ba180acb1025b229dee3d1e61691e75.1748380390.git.code@khaugsbakk.name>
In-Reply-To
<cover.1748380390.git.code@khaugsbakk.name>
From: Kristoffer Haugsbakk <code@khaugsbakk.name>

Document this option by copying the bullet list from git-stripspace(1). A bullet list is cleaner when there are this many points to consider. We also get a more standardized description of the multiple-blank-lines behavior. Compare the repeating (git-notes(1)):

    empty lines other than a single line between paragraphs
With (git-stripspace(1)):
    multiple consecutive empty lines
And:
    leading [...] whitespace
With:
    empty lines from the beginning

Leading whitespace in the form of spaces (indentation) are not removed. However, empty lines at the start of the message are removed.

Note that we drop the mentions of comment line handling because they are wrong; this option does not control how lines which can be recognized as comment lines are handled. Only interactivity controls that:

• Comment lines are stripped after editing interactively
• Lines which could be recognized as comment lines are left alone when
  the message is given non-interactively

So it is misleading to document the comment line behavior on this option.

Further, the text is wrong:
    Lines starting with `#` will be stripped out in non-editor cases
    like `-m`, [...]

Comment lines are still indirectly discussed on other options. We will deal with them in the next commit.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
Notes (series):
    v2:
    • New
    • Together with one other other patch replaces v1 patch “doc: notes:
      mention comment character configuration”
    • I figured out that mentioning the comment character/comment lines
      doesn’t make sense here.  So all attempts to rephrase “comment
      character” or “lines that start with `#`” are gone
 Documentation/git-notes.adoc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-notes.adoc b/Documentation/git-notes.adoc
index 8706b33f2ee..d672794a942 100644
--- a/Documentation/git-notes.adoc
+++ b/Documentation/git-notes.adoc
@@ -184,11 +184,13 @@ OPTIONS
 
 `--stripspace`::
 `--no-stripspace`::
-	Strip leading and trailing whitespace from the note message.
-	Also strip out empty lines other than a single line between
-	paragraphs. Lines starting with `#` will be stripped out
-	in non-editor cases like `-m`, `-F` and `-C`, but not in
-	editor case like `git notes edit`, `-c`, etc.
+	Clean up whitespace. Specifically (see
+	linkgit:git-stripspace[1]):
++
+- remove trailing whitespace from all lines
+- collapse multiple consecutive empty lines into one empty line
+- remove empty lines from the beginning and end of the input
+- add a missing `\n` to the last line if necessary.
 
 `--ref <ref>`::
 	Manipulate the notes tree in _<ref>_.  This overrides
-- 
2.49.0.780.g892193c3f50
Previous: kristofferhaugsbakk@fastmail.comNext: kristofferhaugsbakk@fastmail.com
Message 38 of 44 in “doc: --stdin on notes and core.commentChar mentions”
  1. 0/6 doc: --stdin on notes and core.commentChar mentionskristofferhaugsbakk@fastmail.com, May 20, 2025
  2. 1/6 doc: stripspace: mention where the default comes fromkristofferhaugsbakk@fastmail.com, May 20, 2025
  3. Junio C HamanoMay 20, 2025
  4. Kristoffer HaugsbakkMay 21, 2025
  5. 2/6 doc: config: mention core.commentChar on commit.cleanupkristofferhaugsbakk@fastmail.com, May 20, 2025
  6. 3/6 doc: notes: split out options with negationskristofferhaugsbakk@fastmail.com, May 20, 2025
  7. Junio C HamanoMay 20, 2025
  8. Junio C HamanoMay 21, 2025
  9. Kristoffer HaugsbakkMay 21, 2025
  10. Junio C HamanoMay 21, 2025
  11. Kristoffer HaugsbakkMay 21, 2025
  12. 4/6 doc: notes: mention comment character configurationkristofferhaugsbakk@fastmail.com, May 20, 2025
  13. Junio C HamanoMay 20, 2025
  14. 5/6 doc: notes: point out copy --stdin use with argvkristofferhaugsbakk@fastmail.com, May 20, 2025
  15. Junio C HamanoMay 20, 2025
  16. 6/6 doc: notes: treat --stdin equally between copy/removekristofferhaugsbakk@fastmail.com, May 20, 2025
  17. Junio C HamanoMay 20, 2025
  18. Kristoffer HaugsbakkMay 21, 2025
  19. D. Ben KnobleMay 21, 2025
  20. Kristoffer HaugsbakkMay 21, 2025
  21. Junio C HamanoMay 21, 2025
  22. 0/9 doc: --stdin on notes and core.commentChar mentionskristofferhaugsbakk@fastmail.com, May 23, 2025
  23. 1/9 doc: stripspace: mention where the default comes fromkristofferhaugsbakk@fastmail.com, May 23, 2025
  24. 2/9 doc: config: mention core.commentChar on commit.cleanupkristofferhaugsbakk@fastmail.com, May 23, 2025
  25. 3/9 doc: notes: split out options with negated formskristofferhaugsbakk@fastmail.com, May 23, 2025
  26. 4/9 doc: notes: rework --[no-]stripspacekristofferhaugsbakk@fastmail.com, May 23, 2025
  27. 5/9 doc: notes: remove stripspace discussion from other optionskristofferhaugsbakk@fastmail.com, May 23, 2025
  28. 6/9 doc: notes: clearly state that --stripspace is the defaultkristofferhaugsbakk@fastmail.com, May 23, 2025
  29. Junio C HamanoMay 23, 2025
  30. 7/9 doc: notes: point out copy --stdin use with argvkristofferhaugsbakk@fastmail.com, May 23, 2025
  31. 8/9 doc: notes: treat --stdin equally between copy/removekristofferhaugsbakk@fastmail.com, May 23, 2025
  32. Junio C HamanoMay 23, 2025
  33. 9/9 doc: notes: use stuck form throughoutkristofferhaugsbakk@fastmail.com, May 23, 2025
  34. 0/9 doc: --stdin on notes and core.commentChar mentionskristofferhaugsbakk@fastmail.com, May 27, 2025
  35. 1/9 doc: stripspace: mention where the default comes fromkristofferhaugsbakk@fastmail.com, May 27, 2025
  36. 2/9 doc: config: mention core.commentChar on commit.cleanupkristofferhaugsbakk@fastmail.com, May 27, 2025
  37. 3/9 doc: notes: split out options with negated formskristofferhaugsbakk@fastmail.com, May 27, 2025
  38. 4/9 doc: notes: rework --[no-]stripspacekristofferhaugsbakk@fastmail.com, May 27, 2025
  39. 5/9 doc: notes: remove stripspace discussion from other optionskristofferhaugsbakk@fastmail.com, May 27, 2025
  40. 6/9 doc: notes: clearly state that --stripspace is the defaultkristofferhaugsbakk@fastmail.com, May 27, 2025
  41. 7/9 doc: notes: point out copy --stdin use with argvkristofferhaugsbakk@fastmail.com, May 27, 2025
  42. 8/9 doc: notes: treat --stdin equally between copy/removekristofferhaugsbakk@fastmail.com, May 27, 2025
  43. 9/9 doc: notes: use stuck form throughoutkristofferhaugsbakk@fastmail.com, May 27, 2025
  44. Junio C HamanoMay 27, 2025

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.