Skip to contentSkip to conversation

Subject: [PATCH/RFC] Documentation/git-stripspace: Update synopsis

PATCH Slavomir Vlcek 2 participants 3 messages Jun 15, 2016 Documentation

lore
Share & tools
lore
#0 lore raw

Add synopsis with the '--comment-lines' option.

---

Hi,
there were no mention of '--comment-lines' in the synopsis.

('--comment-lines' and '--strip-comments' options
are mutually exclusive).

I solved this by adding an extra (second) synopsis line so it looks just like the 'usage_msg' in 'builtin/stripspace.c'.

But perhaps it would be wiser to have something like
"git stripspace [[-s | --strip-comments] | [-c | --comment-lines]] < input" instead (and perhaps ordered alphabetically).
This approach can be seen e.g. in the git-add man page.

For the 'master'.

Also, have a few questions about stripspace generally:
a) Should 'git stripspace --comment-lines' really leave the trailing whitespace alone (example: ' hello '->'# hello ')?
b) In the documentation there is:
"-s, --strip-comments
Skip and remove all lines starting with comment character (default #)."

part. This "default" word somehow suggests some new command option that would allow to change the comment character. Would you accept a patch implementing this or such functionality is not desired.

Thank you.

 Documentation/git-stripspace.txt | 1 +
 1 file changed, 1 insertion(+)
Documentation/git-stripspace.txt +1 -0
index c87bfcb..6c6e989 100644
@@ -10,6 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git stripspace' [-s | --strip-comments] < input
+'git stripspace' [-c | --comment-lines] < input
 
 DESCRIPTION
 -----------
Signature · 1 line
2.0.1
#1 lore raw
Quoted 7 lines · Slavomir Vlcek

b) In the documentation there is:
"-s, --strip-comments
Skip and remove all lines starting with comment character (default #)."

part. This "default" word somehow suggests some new command option that would allow to change the comment character. Would you accept a patch implementing this or such functionality is not desired.

I take it back, just found that there is a global "comment_line_char" variable that controls this stuff. Apologizing.

#2 lore raw
In reply to Slavomir Vlcek
Quoted 6 lines · Slavomir Vlcek

I solved this by adding an extra (second) synopsis line so it looks just like the 'usage_msg' in 'builtin/stripspace.c'.

But perhaps it would be wiser to have something like
"git stripspace [[-s | --strip-comments] | [-c | --comment-lines]] < input" instead (and perhaps ordered alphabetically).

That might be more "manly" but much less friendly to humans compared to what your patch gives us.

These two modes are really about two different operations (the latter is not "strip" at all, but is about adding spaces, to which "comments" are often equated to), and two-line synopsis shows more prominently that they are distinct, which I think is the right thing to do.

Quoted 12 lines
Documentation/git-stripspace.txt +1 -0
index c87bfcb..6c6e989 100644
@@ -10,6 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git stripspace' [-s | --strip-comments] < input
+'git stripspace' [-c | --comment-lines] < input
 
 DESCRIPTION
 -----------