On Sun, Dec 11, 2011 at 10:41 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Conrad Irwin <conrad.irwin@xxxxxxxxx> writes: > > The original says "remove" and new one says "normalize*s*". I think we > tend to say things in imperative mood (i.e. without the trailing "s"). Good point, fixed. > > I do not think 'user-provided metadata' is a good wording. This is just a > simple text clean-up filter and you can use it to clean your text files > that you mean to store in the repository as well. Changed just to "text", as that seems simpler. I've left the example uses as is, they were the prime reason for that sentence existing. > > The last one is a bit funny, though. > > By definition, you cannot end the last line with more than one '\n' (upon > seeing the second '\n', you would realize immediately that the line you > saw was _not_ the last line). I think you meant the file does not end with > an incomplete line, i.e. "ensures the output does not end with an > incomplete line by adding '\n' at the end if needed". Hmm, I'm not sure that's the best way of describing it — I've gone with: "add a missing '\n' to the last line if necessary.". > >> +In the case where the input consists entirely of whitespace characters, no >> +output will be produced. >> + >> +*NOTE*: This is intended for cleaning metadata, prefer the `--whitespace=fix` >> +mode of linkgit:git-apply[1] for correcting whitespace of patches or files in >> +the repository. > > I can tell that these three lines were the _primary_ thing you wanted to > add with this patch, having never seen anybody got confused between the > whitespace breakage fix and text cleaning, I wonder if this is adding > clarity or giving users an impression that git can do too many things than > they can wrap their mind around and forcing them to wonder if they have to > learn everything git can do for them. The motivation for this patch was an old post to the Cairo mailing list [1]. There they were using (previously undocumented) behaviour of git stripspace, instead of git apply --whitespace=fix (it may be that --whitespace=fix didn't exist at that point?). I've moved the *NOTE* into a SEE ALSO section where I think it reads less opinionatedly — is that better? > >> OPTIONS >> ------- >> -s:: >> --strip-comments:: >> - In addition to empty lines, also strip lines starting with '#'. >> + Also remove all lines starting with '#'. [snip] > > If I were touching this description, I probably would say something like > "Treat lines starting with a '#' as if they are empty lines". > If only it were that simple! If you have a commented line between two non-commented lines, then no empty line results. I've added an example to the re-rolled patch that show-cases the behaviour of comment stripping in both cases. I went with "skip and remove" as the verb, to imply that the lines are ignored by the previous transformations. Thanks for the detailed feedback. Conrad [1] http://lists.freedesktop.org/archives/cairo/2006-June/007062.html ----8<---- Tell the user what this command is intended for, and expand the description of what it does. Signed-off-by: Conrad Irwin <conrad.irwin@xxxxxxxxx> --- Documentation/git-stripspace.txt | 69 ++++++++++++++++++++++++++++++++++--- builtin/stripspace.c | 2 +- 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt index b78f031..a0a6ea4 100644 --- a/Documentation/git-stripspace.txt +++ b/Documentation/git-stripspace.txt @@ -3,26 +3,83 @@ git-stripspace(1) NAME ---- -git-stripspace - Filter out empty lines +git-stripspace - Remove unnecessary whitespace SYNOPSIS -------- [verse] -'git stripspace' [-s | --strip-comments] < <stream> +'git stripspace' [-s | --strip-comments] < input DESCRIPTION ----------- -Remove multiple empty lines, and empty lines at beginning and end. + +Clean the input in the manner used by 'git' for text such as commit +messages, notes, tags and branch descriptions. + +With no arguments, this will: + +- remove trailing whitespace from all lines +- collapse multiple consecutive empty lines into one empty line +- remove blank lines from the beginning and end of the input +- add a missing '\n' to the last line if necessary. + +In the case where the input consists entirely of whitespace characters, no +output will be produced. OPTIONS ------- -s:: --strip-comments:: - In addition to empty lines, also strip lines starting with '#'. + Skip and remove all lines starting with '#'. + +EXAMPLES +-------- + +Given the following noisy input with '$' indicating the end of a line: + +-------- +|A brief introduction $ +| $ +|$ +|A new paragraph$ +|# with a commented-out line $ +|explaining lots of stuff.$ +|$ +|# An old paragraph, also commented-out. $ +| $ +|The end.$ +| $ +--------- + +Use 'git stripspace' with no arguments to obtain: + +-------- +|A brief introduction$ +|$ +|A new paragraph$ +|# with a commented-out line$ +|explaining lots of stuff.$ +|$ +|# An old paragraph, also commented-out.$ +|$ +|The end.$ +--------- -<stream>:: - Byte stream to act on. +Use 'git stripspace --strip-comments' to obtain: + +-------- +|A brief introduction$ +|$ +|A new paragraph$ +|explaining lots of stuff.$ +|$ +|The end.$ +--------- + +SEE ALSO +-------- +The `--whitespace=fix` mode of linkgit:git-apply[1]. GIT --- diff --git a/builtin/stripspace.c b/builtin/stripspace.c index 1288ffc..f16986c 100644 --- a/builtin/stripspace.c +++ b/builtin/stripspace.c @@ -75,7 +75,7 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix) !strcmp(argv[1], "--strip-comments"))) strip_comments = 1; else if (argc > 1) - usage("git stripspace [-s | --strip-comments] < <stream>"); + usage("git stripspace [-s | --strip-comments] < input"); if (strbuf_read(&buf, 0, 1024) < 0) die_errno("could not read the input"); -- 1.7.8.164.g00d7e -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html