From: "J. Bruce Fields" <bfields@citi.umich.edu>
To: Wincent Colaiuta <win@wincent.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
"J. Bruce Fields" <bfields@citi.umich.edu>
Subject: [PATCH 1/2] builtin-apply: minor cleanup of whitespace detection
Date: Sun, 16 Dec 2007 12:58:01 -0500 [thread overview]
Message-ID: <1197827882-11710-2-git-send-email-bfields@citi.umich.edu> (raw)
In-Reply-To: <1197827882-11710-1-git-send-email-bfields@citi.umich.edu>
Use 0 instead of -1 for the case where not tabs or spaces are found; it
will make some later math slightly simpler.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---
builtin-apply.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin-apply.c b/builtin-apply.c
index 2edd83b..bd94a4b 100644
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -1550,8 +1550,8 @@ static int apply_line(char *output, const char *patch, int plen,
int i;
int add_nl_to_tail = 0;
int fixed = 0;
- int last_tab_in_indent = -1;
- int last_space_in_indent = -1;
+ int last_tab_in_indent = 0;
+ int last_space_in_indent = 0;
int need_fix_leading_space = 0;
char *buf;
@@ -1582,12 +1582,12 @@ static int apply_line(char *output, const char *patch, int plen,
if (ch == '\t') {
last_tab_in_indent = i;
if ((ws_rule & WS_SPACE_BEFORE_TAB) &&
- 0 <= last_space_in_indent)
+ 0 < last_space_in_indent)
need_fix_leading_space = 1;
} else if (ch == ' ') {
last_space_in_indent = i;
if ((ws_rule & WS_INDENT_WITH_NON_TAB) &&
- last_tab_in_indent < 0 &&
+ last_tab_in_indent <= 0 &&
8 <= i)
need_fix_leading_space = 1;
}
--
1.5.4.rc0.44.g21147
next prev parent reply other threads:[~2007-12-16 17:59 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-24 4:24 [PATCH 1/2] builtin-apply: rename "whitespace" variables and fix styles Junio C Hamano
2007-11-24 4:25 ` [PATCH 2/2] builtin-apply: teach whitespace_rules Junio C Hamano
2007-11-24 20:09 ` [PATCH 3/2] core.whitespace: documentation updates Junio C Hamano
2007-11-24 20:22 ` J. Bruce Fields
2007-11-24 21:42 ` Junio C Hamano
2007-11-25 21:58 ` J. Bruce Fields
2007-12-06 9:04 ` Junio C Hamano
2007-12-06 19:18 ` J. Bruce Fields
2007-12-16 3:48 ` J. Bruce Fields
2007-12-16 3:48 ` [PATCH] whitespace: fix off-by-one error in non-space-in-indent checking J. Bruce Fields
2007-12-16 3:48 ` [PATCH] whitespace: reorganize initial-indent check J. Bruce Fields
2007-12-16 3:48 ` [PATCH] whitespace: minor cleanup J. Bruce Fields
2007-12-16 3:48 ` [PATCH] whitespace: fix initial-indent checking J. Bruce Fields
2007-12-16 3:48 ` [PATCH] whitespace: more accurate initial-indent highlighting J. Bruce Fields
2007-12-16 3:48 ` [PATCH] whitespace: fix config.txt description of indent-with-non-tab J. Bruce Fields
2007-12-16 3:54 ` [PATCH] whitespace: fix initial-indent checking J. Bruce Fields
2007-12-16 20:40 ` Junio C Hamano
2007-12-16 21:19 ` J. Bruce Fields
2007-12-16 9:08 ` Jakub Narebski
2007-12-16 10:00 ` Wincent Colaiuta
2007-12-16 16:26 ` J. Bruce Fields
2007-12-16 18:16 ` Jakub Narebski
2007-12-16 18:24 ` Jakub Narebski
2007-12-16 19:59 ` J. Bruce Fields
2007-12-16 20:31 ` Jakub Narebski
2007-12-16 21:00 ` Junio C Hamano
2007-12-16 19:43 ` Junio C Hamano
2007-12-16 10:02 ` [PATCH] whitespace: reorganize initial-indent check Wincent Colaiuta
2007-12-16 16:31 ` J. Bruce Fields
2007-12-16 16:31 ` [PATCH 1/6] whitespace: fix off-by-one error in non-space-in-indent checking J. Bruce Fields
2007-12-16 16:31 ` [PATCH 2/6] whitespace: reorganize initial-indent check J. Bruce Fields
2007-12-16 16:31 ` [PATCH 3/6] whitespace: minor cleanup J. Bruce Fields
2007-12-16 16:31 ` [PATCH 4/6] whitespace: fix initial-indent checking J. Bruce Fields
2007-12-16 16:31 ` [PATCH 5/6] whitespace: more accurate initial-indent highlighting J. Bruce Fields
2007-12-16 16:31 ` [PATCH 6/6] whitespace: fix config.txt description of indent-with-non-tab J. Bruce Fields
2007-12-16 17:58 ` builtin-apply whitespace J. Bruce Fields
2007-12-16 17:58 ` J. Bruce Fields [this message]
2007-12-16 17:58 ` [PATCH 2/2] builtin-apply: stronger indent-with-on-tab fixing J. Bruce Fields
2007-12-17 8:00 ` [PATCH 5/6] whitespace: more accurate initial-indent highlighting Wincent Colaiuta
2007-12-17 8:04 ` Junio C Hamano
2007-12-18 0:32 ` Jakub Narebski
2007-12-18 0:51 ` Junio C Hamano
2007-12-16 21:06 ` [PATCH] whitespace: reorganize initial-indent check Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1197827882-11710-2-git-send-email-bfields@citi.umich.edu \
--to=bfields@citi.umich.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=win@wincent.com \
/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.
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 NNTP newsgroup(s).