diff options
| author |  J. Bruce Fields <bfields@citi.umich.edu> | 2007-09-16 18:49:00 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-17 02:18:44 -0700 |
| commit | d7416ecac8508367a8ac35ab74ef09b7707d0c4b (patch) | |
| tree | 7a53da669ad42caf3999d73c8cf0056e7659aef4 /merge-file.c | |
| parent | apply --index-info: fall back to current index for mode changes (diff) | |
| download | tgif-d7416ecac8508367a8ac35ab74ef09b7707d0c4b.tar.xz | |
git-apply: fix whitespace stripping
The algorithm isn't right here: it accumulates any set of 8 spaces into
tabs even if they're separated by tabs, so
<four spaces><tab><four spaces><tab>
is converted to
<tab><tab><tab>
when it should be just
<tab><tab>
So teach git-apply that a tab hides any group of less than 8 previous
spaces in a row.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions