diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:29:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-20 12:29:01 -0700 |
| commit | 6d3e1f2e453f7473d4ab64ef378309958613c5d7 (patch) | |
| tree | 93863beb9bc01b1bd47dd61e66cf54939cc34e0c /builtin/stripspace.c | |
| parent | Merge branch 'rh/peeling-tag-to-tag' (diff) | |
| parent | t7508: avoid non-portable sed expression (diff) | |
| download | tgif-6d3e1f2e453f7473d4ab64ef378309958613c5d7.tar.xz | |
Merge branch 'mm/status-without-comment-char'
"git status" now omits the prefix to make its output a comment in a
commit log editor, which is not necessary for human consumption.
We may want to tighten the output to omit unnecessary trailing blank
lines, but that does not have to be in the scope of this series.
* mm/status-without-comment-char:
t7508: avoid non-portable sed expression
status: add missing blank line after list of "other" files
tests: don't set status.displayCommentPrefix file-wide
status: disable display of '#' comment prefix by default
submodule summary: ignore --for-status option
wt-status: use argv_array API
builtin/stripspace.c: fix broken indentation
Diffstat (limited to 'builtin/stripspace.c')
| -rw-r--r-- | builtin/stripspace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/stripspace.c b/builtin/stripspace.c index e981dfb9f0..1259ed708b 100644 --- a/builtin/stripspace.c +++ b/builtin/stripspace.c @@ -89,11 +89,11 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix) if (argc == 2) { if (!strcmp(argv[1], "-s") || - !strcmp(argv[1], "--strip-comments")) { - strip_comments = 1; + !strcmp(argv[1], "--strip-comments")) { + strip_comments = 1; } else if (!strcmp(argv[1], "-c") || - !strcmp(argv[1], "--comment-lines")) { - mode = COMMENT_LINES; + !strcmp(argv[1], "--comment-lines")) { + mode = COMMENT_LINES; } else { mode = INVAL; } |