@matheusbsbs / matheus-bagliano / commits / 1187df57c2
Fork 0

The war on trailing whitespace

On Sat, 25 Feb 2006, Andrew Morton wrote: > > I'd suggest a) git will simply refuse to apply such a patch unless given a > special `forcing' flag, b) even when thus forced, it will still warn and c) > with a different flag, it will strip-then-apply, without generating a > warning. This doesn't do the "strip-then-apply" thing, but it allows you to make git-apply generate a warning or error on extraneous whitespace. Use --whitespace=warn to warn, and (surprise, surprise) --whitespace=error to make it a fatal error to have whitespace at the end. Totally untested, of course. But it compiles, so it must be fine. HOWEVER! Note that this literally will check every single patch-line with "+" at the beginning. Which means that if you fix a simple typo, and the line had a space at the end before, and you didn't remove it, that's still considered a "new line with whitespace at the end", even though obviously the line wasn't really new. I assume this is what you wanted, and there isn't really any sane alternatives (you could make the warning activate only for _pure_ additions with no deletions at all in that hunk, but that sounds a bit insane). Linus

Linus Torvalds committed Feb 26, 2006 at 09:29 UTC 1187df57c2ee1119b7ef357cacb63d10581256bc
1 file changed +33
apply.c
+33
@@ -34,6 +34,12 @@ static int line_termination = '\n';
34 static const char apply_usage[] =
35 "git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] <patch>...";
36
37 +static enum whitespace_eol {
38 + nowarn,
39 + warn_on_whitespace,
40 + error_on_whitespace
41 +} new_whitespace = nowarn;
42 +
43 /*
44 * For "diff-stat" like behaviour, we keep track of the biggest change
45 * we've seen, and the longest filename. That allows us to do simple
@@ -815,6 +821,22 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
821 oldlines--;
822 break;
823 case '+':
824 + /*
825 + * We know len is at least two, since we have a '+' and
826 + * we checked that the last character was a '\n' above
827 + */
828 + if (isspace(line[len-2])) {
829 + switch (new_whitespace) {
830 + case nowarn:
831 + break;
832 + case warn_on_whitespace:
833 + new_whitespace = nowarn; /* Just once */
834 + error("Added whitespace at end of line at line %d", linenr);
835 + break;
836 + case error_on_whitespace:
837 + die("Added whitespace at end of line at line %d", linenr);
838 + }
839 + }
840 added++;
841 newlines--;
842 break;
@@ -1831,6 +1853,17 @@ int main(int argc, char **argv)
1853 line_termination = 0;
1854 continue;
1855 }
1856 + if (!strncmp(arg, "--whitespace=", 13)) {
1857 + if (strcmp(arg+13, "warn")) {
1858 + new_whitespace = warn_on_whitespace;
1859 + continue;
1860 + }
1861 + if (strcmp(arg+13, "error")) {
1862 + new_whitespace = error_on_whitespace;
1863 + continue;
1864 + }
1865 + die("unrecognixed whitespace option '%s'", arg+13);
1866 + }
1867
1868 if (check_index && prefix_length < 0) {
1869 prefix = setup_git_directory();