From: "J. Bruce Fields" <bfields@citi.umich.edu>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org, "J. Bruce Fields" <bfields@citi.umich.edu>
Subject: [PATCH 1/3] git-apply: fix whitespace stripping
Date: Sun, 16 Sep 2007 18:49:00 -0400 [thread overview]
Message-ID: <11899829424173-git-send-email-bfields@citi.umich.edu> (raw)
In-Reply-To: <11899829424040-git-send-email-bfields@citi.umich.edu>
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>
---
builtin-apply.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/builtin-apply.c b/builtin-apply.c
index 976ec77..70359c1 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1642,15 +1642,22 @@ static int apply_line(char *output, const char *patch, int plen)
buf = output;
if (need_fix_leading_space) {
+ int consecutive_spaces = 0;
/* between patch[1..last_tab_in_indent] strip the
* funny spaces, updating them to tab as needed.
*/
for (i = 1; i < last_tab_in_indent; i++, plen--) {
char ch = patch[i];
- if (ch != ' ')
+ if (ch != ' ') {
+ consecutive_spaces = 0;
*output++ = ch;
- else if ((i % 8) == 0)
- *output++ = '\t';
+ } else {
+ consecutive_spaces++;
+ if (consecutive_spaces == 8) {
+ *output++ = '\t';
+ consecutive_spaces = 0;
+ }
+ }
}
fixed = 1;
i = last_tab_in_indent;
--
1.5.3.1.42.gfe5df
next prev parent reply other threads:[~2007-09-16 22:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-16 22:48 whitespace-stripping J. Bruce Fields
2007-09-16 22:49 ` J. Bruce Fields [this message]
2007-09-16 22:49 ` [PATCH 2/3] git-apply: complain about >=8 consecutive spaces in initial indent J. Bruce Fields
2007-09-16 22:49 ` [PATCH 3/3] git-apply: add tests for stripping of leading and trailing whitespace J. Bruce Fields
2007-09-17 14:16 ` Krzysztof Halasa
2007-09-17 15:02 ` J. Bruce Fields
2007-09-17 23:44 ` Krzysztof Halasa
2007-09-18 0:53 ` J. Bruce Fields
2007-09-16 23:24 ` [PATCH 2/3] git-apply: complain about >=8 consecutive spaces in initial indent Martin Langhoff
2007-09-17 2:45 ` J. Bruce Fields
2007-09-17 0:24 ` Junio C Hamano
2007-09-17 2:44 ` J. Bruce Fields
2007-10-03 1:00 ` [PATCH] git-diff: " Junio C Hamano
2007-09-18 8:55 ` [PATCH 1/3] git-apply: fix whitespace stripping David Kastrup
2007-09-18 13:12 ` J. Bruce Fields
2007-09-18 14:18 ` David Kastrup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11899829424173-git-send-email-bfields@citi.umich.edu \
--to=bfields@citi.umich.edu \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).