summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Webb <chris@arachsys.com>2010-04-02 23:37:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-04 21:21:54 (GMT)
commit4e35c51e5113e83155a6c44a8f9adeafed9125d2 (patch)
treeb5d3881db8e7fd28da422a50aa24be8b3789b98d
parentd511bd330d66fe8f0be21855888e30af2f3e373b (diff)
downloadgit-4e35c51e5113e83155a6c44a8f9adeafed9125d2.zip
git-4e35c51e5113e83155a6c44a8f9adeafed9125d2.tar.gz
git-4e35c51e5113e83155a6c44a8f9adeafed9125d2.tar.bz2
whitespace: add tab-in-indent support for --whitespace=fix
If tab-in-indent is set, --whitespace=fix will ensure that any stray tabs in the initial indent are expanded to the correct number of space characters. Signed-off-by: Chris Webb <chris@arachsys.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--ws.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/ws.c b/ws.c
index 897ff56..d7b8c33 100644
--- a/ws.c
+++ b/ws.c
@@ -360,6 +360,20 @@ void ws_fix_copy(struct strbuf *dst, const char *src, int len, unsigned ws_rule,
len -= last;
src += last;
fixed = 1;
+ } else if ((ws_rule & WS_TAB_IN_INDENT) && last_tab_in_indent >= 0) {
+ /* Expand tabs into spaces */
+ int last = last_tab_in_indent + 1;
+ for (i = 0; i < last; i++) {
+ if (src[i] == '\t')
+ do {
+ strbuf_addch(dst, ' ');
+ } while (dst->len % 8);
+ else
+ strbuf_addch(dst, src[i]);
+ }
+ len -= last;
+ src += last;
+ fixed = 1;
}
strbuf_add(dst, src, len);