Merge branch 'jc/am-3-show-corrupted-patch'

[git.git] / ws.c

diff --git a/ws.c b/ws.c
index 897ff56a5fcdd0cb0ce8ca849763df0d29424dbb..d7b8c33f14195ba7ebe86bdbca2fea8f1b22ad37 100644 (file)
--- 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);