{"thread":{"id":"11000","subject":"[PATCH 1/2] builtin-apply: rename \"whitespace\" variables and fix styles","startedAt":"2007-11-24T04:24:52Z","lastAt":"2007-12-18T00:51:02Z","messageCount":43,"participants":["Junio C Hamano","J. Bruce Fields","Jakub Narebski","Wincent Colaiuta"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"60799","messageId":"7v8x4os223.fsf@gitster.siamese.dyndns.org","threadId":"11000","inReplyTo":null,"subject":"[PATCH 1/2] builtin-apply: rename \"whitespace\" variables and fix styles","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-11-24T04:24:52Z","receivedAt":"2007-11-24T04:24:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"The variables were somewhat misnamed.\n\n * \"What to do when whitespace errors are detected\" is now called\n \"ws_error_action\" (used to be called \"new_whitespace\");\n\n * The constants to denote the possible actions are \"nowarn_ws_error\",\n \"warn_on_ws_error\", \"die_on_ws_error\", and \"correct_ws_error\". The\n last one used to be \"strip_whitespace\", but we correct whitespace\n error in indent (SP followed by HT) and \"strip\" is not quite an\n accurate name for it.\n\nOther than the renaming of variables and constants, there is no\nfunctional change in this patch. While we are at it, it also fixes\noverly long lines and multi-line comment styles (which of course do\nnot affect the generated code at all).\n\nAh, by the way, this introduces a synonym \"fix\" that is equivalent to\n\"strip\" that you can give to --whitespace=, so in that sense\nit is not exactly \"no functional change whatsoever\".\n\nSigned-off-by: Junio C Hamano \n---\n\n * This is on top of jc/spht topic that is in 'next'. The next one is\n the real thing.\n\n builtin-apply.c | 148 ++++++++++++++++++++++++++++++++++---------------------\n 1 files changed, 91 insertions(+), 57 deletions(-)\n\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex 8411b38..eb09bfe 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -47,12 +47,12 @@ static unsigned long p_context = ULONG_MAX;\n static const char apply_usage[] =\n \"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--cached] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [--reverse] [--reject] [--verbose] [-z] [-pNUM] [-CNUM] [--whitespace=] ...\";\n \n-static enum whitespace_eol {\n-\tnowarn_whitespace,\n-\twarn_on_whitespace,\n-\terror_on_whitespace,\n-\tstrip_whitespace,\n-} new_whitespace = warn_on_whitespace;\n+static enum ws_error_action {\n+\tnowarn_ws_error,\n+\twarn_on_ws_error,\n+\tdie_on_ws_error,\n+\tcorrect_ws_error,\n+} ws_error_action = warn_on_ws_error;\n static int whitespace_error;\n static int squelch_whitespace_errors = 5;\n static int applied_after_fixing_ws;\n@@ -61,28 +61,28 @@ static const char *patch_input_file;\n static void parse_whitespace_option(const char *option)\n {\n \tif (!option) {\n-\t\tnew_whitespace = warn_on_whitespace;\n+\t\tws_error_action = warn_on_ws_error;\n \t\treturn;\n \t}\n \tif (!strcmp(option, \"warn\")) {\n-\t\tnew_whitespace = warn_on_whitespace;\n+\t\tws_error_action = warn_on_ws_error;\n \t\treturn;\n \t}\n \tif (!strcmp(option, \"nowarn\")) {\n-\t\tnew_whitespace = nowarn_whitespace;\n+\t\tws_error_action = nowarn_ws_error;\n \t\treturn;\n \t}\n \tif (!strcmp(option, \"error\")) {\n-\t\tnew_whitespace = error_on_whitespace;\n+\t\tws_error_action = die_on_ws_error;\n \t\treturn;\n \t}\n \tif (!strcmp(option, \"error-all\")) {\n-\t\tnew_whitespace = error_on_whitespace;\n+\t\tws_error_action = die_on_ws_error;\n \t\tsquelch_whitespace_errors = 0;\n \t\treturn;\n \t}\n-\tif (!strcmp(option, \"strip\")) {\n-\t\tnew_whitespace = strip_whitespace;\n+\tif (!strcmp(option, \"strip\") || !strcmp(option, \"fix\")) {\n+\t\tws_error_action = correct_ws_error;\n \t\treturn;\n \t}\n \tdie(\"unrecognized whitespace option '%s'\", option);\n@@ -90,11 +90,8 @@ static void parse_whitespace_option(const char *option)\n \n static void set_default_whitespace_mode(const char *whitespace_option)\n {\n-\tif (!whitespace_option && !apply_default_whitespace) {\n-\t\tnew_whitespace = (apply\n-\t\t\t\t ? warn_on_whitespace\n-\t\t\t\t : nowarn_whitespace);\n-\t}\n+\tif (!whitespace_option && !apply_default_whitespace)\n+\t\tws_error_action = (apply ? warn_on_ws_error : nowarn_ws_error);\n }\n \n /*\n@@ -137,6 +134,11 @@ struct fragment {\n #define BINARY_DELTA_DEFLATED\t1\n #define BINARY_LITERAL_DEFLATED 2\n \n+/*\n+ * This represents a \"patch\" to a file, both metainfo changes\n+ * such as creation/deletion, filemode and content changes represented\n+ * as a series of fragments.\n+ */\n struct patch {\n \tchar *new_name, *old_name, *def_name;\n \tunsigned int old_mode, new_mode;\n@@ -158,7 +160,8 @@ struct patch {\n \tstruct patch *next;\n };\n \n-static void say_patch_name(FILE *output, const char *pre, struct patch *patch, const char *post)\n+static void say_patch_name(FILE *output, const char *pre,\n+\t\t\t struct patch *patch, const char *post)\n {\n \tfputs(pre, output);\n \tif (patch->old_name && patch->new_name &&\n@@ -229,7 +232,8 @@ static char *find_name(const char *line, char *def, int p_value, int terminate)\n \tif (*line == '\"') {\n \t\tstruct strbuf name;\n \n-\t\t/* Proposed \"new-style\" GNU patch/diff format; see\n+\t\t/*\n+\t\t * Proposed \"new-style\" GNU patch/diff format; see\n \t\t * http://marc.theaimsgroup.com/?l=git&m=112927316408690&w=2\n \t\t */\n \t\tstrbuf_init(&name, 0);\n@@ -499,7 +503,8 @@ static int gitdiff_dissimilarity(const char *line, struct patch *patch)\n \n static int gitdiff_index(const char *line, struct patch *patch)\n {\n-\t/* index line is N hexadecimal, \"..\", N hexadecimal,\n+\t/*\n+\t * index line is N hexadecimal, \"..\", N hexadecimal,\n \t * and optional space with octal mode.\n \t */\n \tconst char *ptr, *eol;\n@@ -550,7 +555,8 @@ static const char *stop_at_slash(const char *line, int llen)\n \treturn NULL;\n }\n \n-/* This is to extract the same name that appears on \"diff --git\"\n+/*\n+ * This is to extract the same name that appears on \"diff --git\"\n * line. We do not find and return anything if it is a rename\n * patch, and it is OK because we will find the name elsewhere.\n * We need to reliably find name only when it is mode-change only,\n@@ -584,7 +590,8 @@ static char *git_header_name(char *line, int llen)\n \t\t\tgoto free_and_fail1;\n \t\tstrbuf_remove(&first, 0, cp + 1 - first.buf);\n \n-\t\t/* second points at one past closing dq of name.\n+\t\t/*\n+\t\t * second points at one past closing dq of name.\n \t\t * find the second name.\n \t\t */\n \t\twhile ((second < line + llen) && isspace(*second))\n@@ -627,7 +634,8 @@ static char *git_header_name(char *line, int llen)\n \t\treturn NULL;\n \tname++;\n \n-\t/* since the first name is unquoted, a dq if exists must be\n+\t/*\n+\t * since the first name is unquoted, a dq if exists must be\n \t * the beginning of the second name.\n \t */\n \tfor (second = name; second < line + llen; second++) {\n@@ -759,7 +767,7 @@ static int parse_num(const char *line, unsigned long *p)\n }\n \n static int parse_range(const char *line, int len, int offset, const char *expect,\n-\t\t\tunsigned long *p1, unsigned long *p2)\n+\t\t unsigned long *p1, unsigned long *p2)\n {\n \tint digits, ex;\n \n@@ -868,14 +876,14 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc\n \t\t\treturn offset;\n \t\t}\n \n-\t\t/** --- followed by +++ ? */\n+\t\t/* --- followed by +++ ? */\n \t\tif (memcmp(\"--- \", line, 4) || memcmp(\"+++ \", line + len, 4))\n \t\t\tcontinue;\n \n \t\t/*\n \t\t * We only accept unified patches, so we want it to\n \t\t * at least have \"@@ -a,b +c,d @@\\n\", which is 14 chars\n-\t\t * minimum\n+\t\t * minimum (\"@@ -0,0 +1 @@\\n\" is the shortest).\n \t\t */\n \t\tnextlen = linelen(line + len, size - len);\n \t\tif (size < nextlen + 14 || memcmp(\"@@ -\", line + len + nextlen, 4))\n@@ -932,14 +940,14 @@ static void check_whitespace(const char *line, int len)\n \t\t\terr, patch_input_file, linenr, len-2, line+1);\n }\n \n-\n /*\n * Parse a unified diff. Note that this really needs to parse each\n * fragment separately, since the only way to know the difference\n * between a \"---\" that is part of a patch, and a \"---\" that starts\n * the next patch is to look at the line counts..\n */\n-static int parse_fragment(char *line, unsigned long size, struct patch *patch, struct fragment *fragment)\n+static int parse_fragment(char *line, unsigned long size,\n+\t\t\t struct patch *patch, struct fragment *fragment)\n {\n \tint added, deleted;\n \tint len = linelen(line, size), offset;\n@@ -980,7 +988,7 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s\n \t\t\tbreak;\n \t\tcase '-':\n \t\t\tif (apply_in_reverse &&\n-\t\t\t\t\tnew_whitespace != nowarn_whitespace)\n+\t\t\t ws_error_action != nowarn_ws_error)\n \t\t\t\tcheck_whitespace(line, len);\n \t\t\tdeleted++;\n \t\t\toldlines--;\n@@ -988,14 +996,15 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s\n \t\t\tbreak;\n \t\tcase '+':\n \t\t\tif (!apply_in_reverse &&\n-\t\t\t\t\tnew_whitespace != nowarn_whitespace)\n+\t\t\t ws_error_action != nowarn_ws_error)\n \t\t\t\tcheck_whitespace(line, len);\n \t\t\tadded++;\n \t\t\tnewlines--;\n \t\t\ttrailing = 0;\n \t\t\tbreak;\n \n- /* We allow \"\\ No newline at end of file\". Depending\n+\t\t/*\n+\t\t * We allow \"\\ No newline at end of file\". Depending\n * on locale settings when the patch was produced we\n * don't know what this line looks like. The only\n * thing we do know is that it begins with \"\\ \".\n@@ -1013,7 +1022,8 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s\n \tfragment->leading = leading;\n \tfragment->trailing = trailing;\n \n-\t/* If a fragment ends with an incomplete line, we failed to include\n+\t/*\n+\t * If a fragment ends with an incomplete line, we failed to include\n \t * it in the above loop because we hit oldlines == newlines == 0\n \t * before seeing it.\n \t */\n@@ -1141,7 +1151,8 @@ static struct fragment *parse_binary_hunk(char **buf_p,\n \t\t\t\t\t int *status_p,\n \t\t\t\t\t int *used_p)\n {\n-\t/* Expect a line that begins with binary patch method (\"literal\"\n+\t/*\n+\t * Expect a line that begins with binary patch method (\"literal\"\n \t * or \"delta\"), followed by the length of data before deflating.\n \t * a sequence of 'length-byte' followed by base-85 encoded data\n \t * should follow, terminated by a newline.\n@@ -1190,7 +1201,8 @@ static struct fragment *parse_binary_hunk(char **buf_p,\n \t\t\tsize--;\n \t\t\tbreak;\n \t\t}\n-\t\t/* Minimum line is \"A00000\\n\" which is 7-byte long,\n+\t\t/*\n+\t\t * Minimum line is \"A00000\\n\" which is 7-byte long,\n \t\t * and the line length must be multiple of 5 plus 2.\n \t\t */\n \t\tif ((llen < 7) || (llen-2) % 5)\n@@ -1241,7 +1253,8 @@ static struct fragment *parse_binary_hunk(char **buf_p,\n \n static int parse_binary(char *buffer, unsigned long size, struct patch *patch)\n {\n-\t/* We have read \"GIT binary patch\\n\"; what follows is a line\n+\t/*\n+\t * We have read \"GIT binary patch\\n\"; what follows is a line\n \t * that says the patch method (currently, either \"literal\" or\n \t * \"delta\") and the length of data before deflating; a\n \t * sequence of 'length-byte' followed by base-85 encoded data\n@@ -1271,7 +1284,8 @@ static int parse_binary(char *buffer, unsigned long size, struct patch *patch)\n \tif (reverse)\n \t\tused += used_1;\n \telse if (status) {\n-\t\t/* not having reverse hunk is not an error, but having\n+\t\t/*\n+\t\t * Not having reverse hunk is not an error, but having\n \t\t * a corrupt reverse hunk is.\n \t\t */\n \t\tfree((void*) forward->patch);\n@@ -1292,7 +1306,8 @@ static int parse_chunk(char *buffer, unsigned long size, struct patch *patch)\n \tif (offset < 0)\n \t\treturn offset;\n \n-\tpatchsize = parse_single_patch(buffer + offset + hdrsize, size - offset - hdrsize, patch);\n+\tpatchsize = parse_single_patch(buffer + offset + hdrsize,\n+\t\t\t\t size - offset - hdrsize, patch);\n \n \tif (!patchsize) {\n \t\tstatic const char *binhdr[] = {\n@@ -1368,8 +1383,10 @@ static void reverse_patches(struct patch *p)\n \t}\n }\n \n-static const char pluses[] = \"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\";\n-static const char minuses[]= \"----------------------------------------------------------------------\";\n+static const char pluses[] =\n+\"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\";\n+static const char minuses[]=\n+\"----------------------------------------------------------------------\";\n \n static void show_stats(struct patch *patch)\n {\n@@ -1438,7 +1455,9 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)\n \t}\n }\n \n-static int find_offset(const char *buf, unsigned long size, const char *fragment, unsigned long fragsize, int line, int *lines)\n+static int find_offset(const char *buf, unsigned long size,\n+\t\t const char *fragment, unsigned long fragsize,\n+\t\t int line, int *lines)\n {\n \tint i;\n \tunsigned long start, backwards, forwards;\n@@ -1539,7 +1558,8 @@ static void remove_last_line(const char **rbuf, int *rsize)\n \n static int apply_line(char *output, const char *patch, int plen)\n {\n-\t/* plen is number of bytes to be copied from patch,\n+\t/*\n+\t * plen is number of bytes to be copied from patch,\n \t * starting at patch+1 (patch[0] is '+'). Typically\n \t * patch[plen] is '\\n', unless this is the incomplete\n \t * last line.\n@@ -1552,12 +1572,15 @@ static int apply_line(char *output, const char *patch, int plen)\n \tint need_fix_leading_space = 0;\n \tchar *buf;\n \n-\tif ((new_whitespace != strip_whitespace) || !whitespace_error ||\n+\tif ((ws_error_action != correct_ws_error) || !whitespace_error ||\n \t *patch != '+') {\n \t\tmemcpy(output, patch + 1, plen);\n \t\treturn plen;\n \t}\n \n+\t/*\n+\t * Strip trailing whitespace\n+\t */\n \tif (1 < plen && isspace(patch[plen-1])) {\n \t\tif (patch[plen] == '\\n')\n \t\t\tadd_nl_to_tail = 1;\n@@ -1567,6 +1590,9 @@ static int apply_line(char *output, const char *patch, int plen)\n \t\tfixed = 1;\n \t}\n \n+\t/*\n+\t * Check leading whitespaces (indent)\n+\t */\n \tfor (i = 1; i < plen; i++) {\n \t\tchar ch = patch[i];\n \t\tif (ch == '\\t') {\n@@ -1583,7 +1609,8 @@ static int apply_line(char *output, const char *patch, int plen)\n \tbuf = output;\n \tif (need_fix_leading_space) {\n \t\tint consecutive_spaces = 0;\n-\t\t/* between patch[1..last_tab_in_indent] strip the\n+\t\t/*\n+\t\t * between patch[1..last_tab_in_indent] strip the\n \t\t * funny spaces, updating them to tab as needed.\n \t\t */\n \t\tfor (i = 1; i < last_tab_in_indent; i++, plen--) {\n@@ -1613,7 +1640,8 @@ static int apply_line(char *output, const char *patch, int plen)\n \treturn output + plen - buf;\n }\n \n-static int apply_one_fragment(struct strbuf *buf, struct fragment *frag, int inaccurate_eof)\n+static int apply_one_fragment(struct strbuf *buf, struct fragment *frag,\n+\t\t\t int inaccurate_eof)\n {\n \tint match_beginning, match_end;\n \tconst char *patch = frag->patch;\n@@ -1695,8 +1723,9 @@ static int apply_one_fragment(struct strbuf *buf, struct fragment *frag, int ina\n \t\tsize -= len;\n \t}\n \n-\tif (inaccurate_eof && oldsize > 0 && old[oldsize - 1] == '\\n' &&\n-\t\t\tnewsize > 0 && new[newsize - 1] == '\\n') {\n+\tif (inaccurate_eof &&\n+\t oldsize > 0 && old[oldsize - 1] == '\\n' &&\n+\t newsize > 0 && new[newsize - 1] == '\\n') {\n \t\toldsize--;\n \t\tnewsize--;\n \t}\n@@ -1733,7 +1762,7 @@ static int apply_one_fragment(struct strbuf *buf, struct fragment *frag, int ina\n \t\tif (match_beginning && offset)\n \t\t\toffset = -1;\n \t\tif (offset >= 0) {\n-\t\t\tif (new_whitespace == strip_whitespace &&\n+\t\t\tif (ws_error_action == correct_ws_error &&\n \t\t\t (buf->len - oldsize - offset == 0)) /* end of file? */\n \t\t\t\tnewsize -= new_blank_lines_at_end;\n \n@@ -1758,9 +1787,10 @@ static int apply_one_fragment(struct strbuf *buf, struct fragment *frag, int ina\n \t\t\tmatch_beginning = match_end = 0;\n \t\t\tcontinue;\n \t\t}\n-\t\t/* Reduce the number of context lines\n-\t\t * Reduce both leading and trailing if they are equal\n-\t\t * otherwise just reduce the larger context.\n+\t\t/*\n+\t\t * Reduce the number of context lines; reduce both\n+\t\t * leading and trailing if they are equal otherwise\n+\t\t * just reduce the larger context.\n \t\t */\n \t\tif (leading >= trailing) {\n \t\t\tremove_first_line(&oldlines, &oldsize);\n@@ -1820,7 +1850,8 @@ static int apply_binary(struct strbuf *buf, struct patch *patch)\n \tconst char *name = patch->old_name ? patch->old_name : patch->new_name;\n \tunsigned char sha1[20];\n \n-\t/* For safety, we require patch index line to contain\n+\t/*\n+\t * For safety, we require patch index line to contain\n \t * full 40-byte textual SHA1 for old and new, at least for now.\n \t */\n \tif (strlen(patch->old_sha1_prefix) != 40 ||\n@@ -1831,7 +1862,8 @@ static int apply_binary(struct strbuf *buf, struct patch *patch)\n \t\t\t \"without full index line\", name);\n \n \tif (patch->old_name) {\n-\t\t/* See if the old one matches what the patch\n+\t\t/*\n+\t\t * See if the old one matches what the patch\n \t\t * applies to.\n \t\t */\n \t\thash_sha1_file(buf->buf, buf->len, blob_type, sha1);\n@@ -1868,7 +1900,8 @@ static int apply_binary(struct strbuf *buf, struct patch *patch)\n \t\t/* XXX read_sha1_file NUL-terminates */\n \t\tstrbuf_attach(buf, result, size, size + 1);\n \t} else {\n-\t\t/* We have verified buf matches the preimage;\n+\t\t/*\n+\t\t * We have verified buf matches the preimage;\n \t\t * apply the patch data to it, which is stored\n \t\t * in the patch->fragments->{patch,size}.\n \t\t */\n@@ -2067,7 +2100,8 @@ static int check_patch(struct patch *patch, struct patch *prev_patch)\n \n \tif (new_name && prev_patch && 0 < prev_patch->is_delete &&\n \t !strcmp(prev_patch->old_name, new_name))\n-\t\t/* A type-change diff is always split into a patch to\n+\t\t/*\n+\t\t * A type-change diff is always split into a patch to\n \t\t * delete old, immediately followed by a patch to\n \t\t * create new (see diff.c::run_diff()); in such a case\n \t\t * it is Ok that the entry to be deleted by the\n@@ -2671,7 +2705,7 @@ static int apply_patch(int fd, const char *filename, int inaccurate_eof)\n \t\toffset += nr;\n \t}\n \n-\tif (whitespace_error && (new_whitespace == error_on_whitespace))\n+\tif (whitespace_error && (ws_error_action == die_on_ws_error))\n \t\tapply = 0;\n \n \tupdate_index = check_index && apply;\n@@ -2866,7 +2900,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)\n \t\t\t\tsquelched,\n \t\t\t\tsquelched == 1 ? \"\" : \"s\");\n \t\t}\n-\t\tif (new_whitespace == error_on_whitespace)\n+\t\tif (ws_error_action == die_on_ws_error)\n \t\t\tdie(\"%d line%s add%s whitespace errors.\",\n \t\t\t whitespace_error,\n \t\t\t whitespace_error == 1 ? \"\" : \"s\",\n-- \n1.5.3.6.1991.ge56ac\n"},{"id":"60800","messageId":"7v4pfcs20b.fsf@gitster.siamese.dyndns.org","threadId":"11000","inReplyTo":"7v8x4os223.fsf@gitster.siamese.dyndns.org","subject":"[PATCH 2/2] builtin-apply: teach whitespace_rules","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-11-24T04:25:56Z","receivedAt":"2007-11-24T04:25:56Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"We earlier introduced core.whitespace to allow users to tweak the\ndefinition of what the \"whitespace errors\" are, for the purpose of diff\noutput highlighting. This teaches the same to git-apply, so that the\ncommand can both detect (when --whitespace=warn option is given) and fix\n(when --whitespace=fix option is given) as configured.\n\nSigned-off-by: Junio C Hamano \n---\n builtin-apply.c | 68 +++++++++++++++++-------\n t/t4124-apply-ws-rule.sh | 133 ++++++++++++++++++++++++++++++++++++++++++++++\n 2 files changed, 182 insertions(+), 19 deletions(-)\n create mode 100755 t/t4124-apply-ws-rule.sh\n\ndiff --git a/builtin-apply.c b/builtin-apply.c\nindex eb09bfe..e04b493 100644\n--- a/builtin-apply.c\n+++ b/builtin-apply.c\n@@ -910,23 +910,35 @@ static void check_whitespace(const char *line, int len)\n \t * this function. That is, an addition of an empty line would\n \t * check the '+' here. Sneaky...\n \t */\n-\tif (isspace(line[len-2]))\n+\tif ((whitespace_rule & WS_TRAILING_SPACE) && isspace(line[len-2]))\n \t\tgoto error;\n \n \t/*\n \t * Make sure that there is no space followed by a tab in\n \t * indentation.\n \t */\n-\terr = \"Space in indent is followed by a tab\";\n-\tfor (i = 1; i < len; i++) {\n-\t\tif (line[i] == '\\t') {\n-\t\t\tif (seen_space)\n-\t\t\t\tgoto error;\n-\t\t}\n-\t\telse if (line[i] == ' ')\n-\t\t\tseen_space = 1;\n-\t\telse\n-\t\t\tbreak;\n+\tif (whitespace_rule & WS_SPACE_BEFORE_TAB) {\n+\t\terr = \"Space in indent is followed by a tab\";\n+\t\tfor (i = 1; i < len; i++) {\n+\t\t\tif (line[i] == '\\t') {\n+\t\t\t\tif (seen_space)\n+\t\t\t\t\tgoto error;\n+\t\t\t}\n+\t\t\telse if (line[i] == ' ')\n+\t\t\t\tseen_space = 1;\n+\t\t\telse\n+\t\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\t/*\n+\t * Make sure that the indentation does not contain more than\n+\t * 8 spaces.\n+\t */\n+\tif ((whitespace_rule & WS_INDENT_WITH_NON_TAB) &&\n+\t (8 < len) && !strncmp(\"+ \", line, 9)) {\n+\t\terr = \"Indent more than 8 places with spaces\";\n+\t\tgoto error;\n \t}\n \treturn;\n \n@@ -1581,7 +1593,8 @@ static int apply_line(char *output, const char *patch, int plen)\n \t/*\n \t * Strip trailing whitespace\n \t */\n-\tif (1 < plen && isspace(patch[plen-1])) {\n+\tif ((whitespace_rule & WS_TRAILING_SPACE) &&\n+\t (1 < plen && isspace(patch[plen-1]))) {\n \t\tif (patch[plen] == '\\n')\n \t\t\tadd_nl_to_tail = 1;\n \t\tplen--;\n@@ -1597,11 +1610,16 @@ static int apply_line(char *output, const char *patch, int plen)\n \t\tchar ch = patch[i];\n \t\tif (ch == '\\t') {\n \t\t\tlast_tab_in_indent = i;\n-\t\t\tif (0 <= last_space_in_indent)\n+\t\t\tif ((whitespace_rule & WS_SPACE_BEFORE_TAB) &&\n+\t\t\t 0 <= last_space_in_indent)\n+\t\t\t need_fix_leading_space = 1;\n+\t\t} else if (ch == ' ') {\n+\t\t\tlast_space_in_indent = i;\n+\t\t\tif ((whitespace_rule & WS_INDENT_WITH_NON_TAB) &&\n+\t\t\t last_tab_in_indent < 0 &&\n+\t\t\t 8 <= i)\n \t\t\t\tneed_fix_leading_space = 1;\n \t\t}\n-\t\telse if (ch == ' ')\n-\t\t\tlast_space_in_indent = i;\n \t\telse\n \t\t\tbreak;\n \t}\n@@ -1609,11 +1627,21 @@ static int apply_line(char *output, const char *patch, int plen)\n \tbuf = output;\n \tif (need_fix_leading_space) {\n \t\tint consecutive_spaces = 0;\n+\t\tint last = last_tab_in_indent + 1;\n+\n+\t\tif (whitespace_rule & WS_INDENT_WITH_NON_TAB) {\n+\t\t\t/* have \"last\" point at one past the indent */\n+\t\t\tif (last_tab_in_indent < last_space_in_indent)\n+\t\t\t\tlast = last_space_in_indent + 1;\n+\t\t\telse\n+\t\t\t\tlast = last_tab_in_indent + 1;\n+\t\t}\n+\n \t\t/*\n-\t\t * between patch[1..last_tab_in_indent] strip the\n-\t\t * funny spaces, updating them to tab as needed.\n+\t\t * between patch[1..last], strip the funny spaces,\n+\t\t * updating them to tab as needed.\n \t\t */\n-\t\tfor (i = 1; i < last_tab_in_indent; i++, plen--) {\n+\t\tfor (i = 1; i < last; i++, plen--) {\n \t\t\tchar ch = patch[i];\n \t\t\tif (ch != ' ') {\n \t\t\t\tconsecutive_spaces = 0;\n@@ -1626,8 +1654,10 @@ static int apply_line(char *output, const char *patch, int plen)\n \t\t\t\t}\n \t\t\t}\n \t\t}\n+\t\twhile (0 < consecutive_spaces--)\n+\t\t\t*output++ = ' ';\n \t\tfixed = 1;\n-\t\ti = last_tab_in_indent;\n+\t\ti = last;\n \t}\n \telse\n \t\ti = 1;\ndiff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh\nnew file mode 100755\nindex 0000000..f53ac46\n--- /dev/null\n+++ b/t/t4124-apply-ws-rule.sh\n@@ -0,0 +1,133 @@\n+#!/bin/sh\n+\n+test_description='core.whitespace rules and git-apply'\n+\n+. ./test-lib.sh\n+\n+prepare_test_file () {\n+\n+\t# A line that has character X is touched iff RULE is in effect:\n+\t# X RULE\n+\t# \t! trailing-space\n+\t# \t@ space-before-tab\n+\t# \t# indent-with-non-tab\n+\tsed -e \"s/_/ /g\" -e \"s/>/\t/\" <<-\\EOF\n+\t\tAn_SP in an ordinary line>and a HT.\n+\t\t>A HT.\n+\t\t_>A SP and a HT (@).\n+\t\t_>_A SP, a HT and a SP (@).\n+\t\t_______Seven SP.\n+\t\t________Eight SP (#).\n+\t\t_______>Seven SP and a HT (@).\n+\t\t________>Eight SP and a HT (@#).\n+\t\t_______>_Seven SP, a HT and a SP (@).\n+\t\t________>_Eight SP, a HT and a SP (@#).\n+\t\t_______________Fifteen SP (#).\n+\t\t_______________>Fifteen SP and a HT (@#).\n+\t\t________________Sixteen SP (#).\n+\t\t________________>Sixteen SP and a HT (@#).\n+\t\t_____a__Five SP, a non WS, two SP.\n+\t\tA line with a (!) trailing SP_\n+\t\tA line with a (!) trailing HT>\n+\tEOF\n+}\n+\n+apply_patch () {\n+\t>target &&\n+\tsed -e \"s|\\([ab]\\)/file|\\1/target|\" //p\" >fixed\n+\n+\t# the changed lines are all expeced to change\n+\tfixed_cnt=$(wc -l fixed-patch\n+\ttest -s fixed-patch && return 0\n+\n+\t# Make sure it is complaint-free\n+\t>target\n+\tgit apply --whitespace=error-all file &&\n+\tgit add file &&\n+\tprepare_test_file >file &&\n+\tgit diff-files -p >patch &&\n+\t>target &&\n+\tgit add target\n+\n+'\n+\n+test_expect_success 'whitespace=nowarn, default rule' '\n+\n+\tapply_patch --whitespace=nowarn &&\n+\tdiff file target\n+\n+'\n+\n+test_expect_success 'whitespace=warn, default rule' '\n+\n+\tapply_patch --whitespace=warn &&\n+\tdiff file target\n+\n+'\n+\n+test_expect_success 'whitespace=error-all, default rule' '\n+\n+\tapply_patch --whitespace=error-all && return 1\n+\ttest -s target && return 1\n+\t: happy\n+\n+'\n+\n+test_expect_success 'whitespace=error-all, no rule' '\n+\n+\tgit config core.whitespace -trailing,-space-before,-indent &&\n+\tapply_patch --whitespace=error-all &&\n+\tdiff file target\n+\n+'\n+\n+for t in - ''\n+do\n+\tcase \"$t\" in '') tt='!' ;; *) tt= ;; esac\n+\tfor s in - ''\n+\tdo\n+\t\tcase \"$s\" in '') ts='@' ;; *) ts= ;; esac\n+\t\tfor i in - ''\n+\t\tdo\n+\t\t\tcase \"$i\" in '') ti='#' ;; *) ti= ;; esac\n+\t\t\trule=${t}trailing,${s}space,${i}indent &&\n+\t\t\ttest_expect_success \"rule=$rule\" '\n+\t\t\t\tgit config core.whitespace \"$rule\" &&\n+\t\t\t\ttest_fix \"$tt$ts$ti\"\n+\t\t\t'\n+\t\tdone\n+\tdone\n+done\n+\n+test_done\n-- \n1.5.3.6.1991.ge56ac\n"},{"id":"60822","messageId":"7v7ik7quc6.fsf_-_@gitster.siamese.dyndns.org","threadId":"11000","inReplyTo":"7v4pfcs20b.fsf@gitster.siamese.dyndns.org","subject":"[PATCH 3/2] core.whitespace: documentation updates.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2007-11-24T20:09:13Z","receivedAt":"2007-11-24T20:09:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"This adds description of core.whitespace to the manual page of git-config,\nand updates the stale description of whitespace handling in the manual\npage of git-apply.\n\nAlso demote \"strip\" to a synonym status for \"fix\" as the value of --whitespace\noption given to git-apply.\n\nSigned-off-by: Junio C Hamano \n---\n\n * This is meant to conclude the \"War on more than 8-SP indent\" Bruce\n started some time ago. It is now configurable, and turned off by\n default, so hopefully people outside the kernel circle would not mind.\n\n A possible addition to the repertoire of core.whitespace is to add\n \"cr-at-end\", which would consider a line that ends with CR an error.\n We redefine \"trailing-space\" not to complain to a line ending with\n CRLF but otherwise does not have trailing whitespaces. To be\n compatible with the current behaviour, cr-at-end needs to be added to\n the default set of errors to be detected, but it might be an\n improvement if we stopped treating 'cr-at-end' as an error by\n default.\n\n Documentation/config.txt | 18 ++++++++++++++++--\n Documentation/git-apply.txt | 35 +++++++++++++++++++++--------------\n builtin-apply.c | 2 +-\n 3 files changed, 38 insertions(+), 17 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex edf50cd..0e71137 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -293,6 +293,20 @@ core.pager::\n \tThe command that git will use to paginate output. Can be overridden\n \twith the `GIT_PAGER` environment variable.\n \n+core.whitespace::\n+\tA comma separated list of common whitespace problems to\n+\tnotice. `git diff` will use `color.diff.whitespace` to\n+\thighlight them, and `git apply --whitespace=error` will\n+\tconsider them as errors:\n++\n+* `trailing-space` treats trailing whitespaces at the end of the line\n+ as an error (enabled by default).\n+* `space-before-tab` treats a space character that appears immediately\n+ before a tab character in the initial indent part of the line as an\n+ error (enabled by default).\n+* `indent-with-non-tab` treats a line that is indented with 8 or more\n+ space characters that can be replaced with tab characters.\n+\n alias.*::\n \tCommand aliases for the gitlink:git[1] command wrapper - e.g.\n \tafter defining \"alias.last = cat-file commit HEAD\", the invocation\n@@ -378,8 +392,8 @@ color.diff.::\n \twhich part of the patch to use the specified color, and is one\n \tof `plain` (context text), `meta` (metainformation), `frag`\n \t(hunk header), `old` (removed lines), `new` (added lines),\n-\t`commit` (commit headers), or `whitespace` (highlighting dubious\n-\twhitespace). The values of these variables may be specified as\n+\t`commit` (commit headers), or `whitespace` (highlighting\n+\twhitespace errors). The values of these variables may be specified as\n \tin color.branch..\n \n color.pager::\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex c1c54bf..bae3e7b 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -13,7 +13,7 @@ SYNOPSIS\n \t [--apply] [--no-add] [--build-fake-ancestor ] [-R | --reverse]\n \t [--allow-binary-replacement | --binary] [--reject] [-z]\n \t [-pNUM] [-CNUM] [--inaccurate-eof] [--cached]\n-\t [--whitespace=]\n+\t [--whitespace=]\n \t [--exclude=PATH] [--verbose] [...]\n \n DESCRIPTION\n@@ -135,25 +135,32 @@ discouraged.\n \tbe useful when importing patchsets, where you want to exclude certain\n \tfiles or directories.\n \n---whitespace=