git/ws.c, branch v1.6.3

Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer

2008-10-12T19:36:19Z

Many call sites use strbuf_init(&foo, 0) to initialize local strbuf variable "foo" which has not been accessed since its declaration. These can be replaced with a static initialization using the STRBUF_INIT macro which is just as readable, saves a function call, and takes up fewer lines. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce

Teach "diff --check" about new blank lines at end

2008-06-27T05:07:26Z

When a patch adds new blank lines at the end, "git apply --whitespace" warns. This teaches "diff --check" to do the same. Signed-off-by: Junio C Hamano

check_and_emit_line(): rename and refactor

2008-06-27T01:13:50Z

The function name was too bland and not explicit enough as to what it is checking. Split it into two, and call the one that checks if there is a whitespace breakage "ws_check()", and call the other one that checks and emits the line after color coding "ws_check_emit()". Signed-off-by: Junio C Hamano

git-apply --whitespace=fix: fix off by one thinko

2008-02-26T20:24:40Z

When a patch adds a whitespace followed by end-of-line, the trailing whitespace error was detected correctly but was not fixed, due to misconversion in 42ab241 (builtin-apply.c: do not feed copy_wsfix() leading '+'). Signed-off-by: Junio C Hamano

ws_fix_copy(): move the whitespace fixing function to ws.c

2008-02-24T00:59:16Z

This is used by git-apply but we can use it elsewhere by slightly generalizing it. Signed-off-by: Junio C Hamano

core.whitespace: cr-at-eol

2008-02-05T08:38:41Z

This new error mode allows a line to have a carriage return at the end of the line when checking and fixing trailing whitespace errors. Some people like to keep CRLF line ending recorded in the repository, and still want to take advantage of the automated trailing whitespace stripping. We still show ^M in the diff output piped to "less" to remind them that they do have the CR at the end, but these carriage return characters at the end are no longer flagged as errors. Signed-off-by: Junio C Hamano

whitespace: more accurate initial-indent highlighting

2007-12-16T21:07:58Z

Instead of highlighting the entire initial indent, highlight only the problematic spaces. In the case of an indent like ' \t \t' there may be multiple problematic ranges, so it's easiest to emit the highlighting as we go instead of trying rember disjoint ranges and do it all at the end. Signed-off-by: J. Bruce Fields Signed-off-by: Junio C Hamano

whitespace: fix initial-indent checking

2007-12-16T21:07:49Z

After this patch, "written" counts the number of bytes up to and including the most recently seen tab. This allows us to detect (and count) spaces by comparing to "i". This allows catching initial indents like '\t ' (a tab followed by 8 spaces), while previously indent-with-non-tab caught only indents that consisted entirely of spaces. This also allows fixing an indent-with-non-tab regression, so we can again detect indents like '\t \t'. Also update tests to catch these cases. Signed-off-by: J. Bruce Fields Signed-off-by: Junio C Hamano

whitespace: minor cleanup

2007-12-16T21:07:41Z

The variable leading_space is initially used to represent the index of the last space seen before a non-space. Then later it represents the index of the first non-indent character. It will prove simpler to replace it by a variable representing a number of bytes. Eventually it will represent the number of bytes written so far (in the stream != NULL case). Signed-off-by: J. Bruce Fields Signed-off-by: Junio C Hamano

whitespace: reorganize initial-indent check

2007-12-16T21:07:20Z

Reorganize to emphasize the most complicated part of the code (the tab case). Signed-off-by: J. Bruce Fields Signed-off-by: Junio C Hamano