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

dscho · gitster · commit f653aee5a37b · 2007-07-26T22:51:44.000-07:00
With --strip-comments (or short -s), git stripspace now removes lines
beginning with a '#', too.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt
@@ -8,14 +8,17 @@ git-stripspace - Filter out empty lines
 
 SYNOPSIS
 --------
-'git-stripspace' < <stream>
+'git-stripspace' [-s | --strip-comments] < <stream>
 
 DESCRIPTION
 -----------
 Remove multiple empty lines, and empty lines at beginning and end.
 
 OPTIONS
 -------
+-s\|--strip-comments::
+	In addition to empty lines, also strip lines starting with '#'.
+
 <stream>::
 	Byte stream to act on.
 
diff --git 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);
diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
@@ -392,4 +392,9 @@ test_expect_success \
     git diff expect actual
 '
 
+test_expect_success 'strip comments, too' '
+	test ! -z "$(echo "# comment" | git stripspace)" &&
+	test -z "$(echo "# comment" | git stripspace -s)"
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -392,4 +392,9 @@ test_expect_success \`
`392`	`392`	`git diff expect actual`
`393`	`393`	`'`
`394`	`394`
	`395`	`+test_expect_success 'strip comments, too' '`
	`396`	`+ test ! -z "$(echo "# comment" \| git stripspace)" &&`
	`397`	`+ test -z "$(echo "# comment" \| git stripspace -s)"`
	`398`	`+'`
	`399`	`+`
`395`	`400`	`test_done`