Teach "git stripspace" the --strip-comments option

With --strip-comments (or short -s), git stripspace now removes lines
beginning with a '#', too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/builtin-stripspace.c b/builtin-stripspace.c
index 55716873dc..916355ca5d 100644
--- a/builtin-stripspace.c
+++ b/builtin-stripspace.c
@@ -76,6 +76,11 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix)
 {
 	char *buffer;
 	unsigned long size;
+	int strip_comments = 0;
+
+	if (argc > 1 && (!strcmp(argv[1], "-s") ||
+				!strcmp(argv[1], "--strip-comments")))
+		strip_comments = 1;
 
 	size = 1024;
 	buffer = xmalloc(size);
@@ -84,7 +89,7 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix)
 		die("could not read the input");
 	}
 
-	size = stripspace(buffer, size, 0);
+	size = stripspace(buffer, size, strip_comments);
 	write_or_die(1, buffer, size);
 	if (size)
 		putc('\n', stdout);