Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Make "diff --check" output match "git apply"
[gitweb.git]
/
builtin-apply.c
diff --git
a/builtin-apply.c
b/builtin-apply.c
index ab393f32e9740c00b5e8fb40076516de7924c16f..2edd83bf40f51f52e58737ef5e7220ae70afb6e1 100644
(file)
--- a/
builtin-apply.c
+++ b/
builtin-apply.c
@@
-912,8
+912,8
@@
static void check_whitespace(const char *line, int len, unsigned ws_rule)
;
else {
err = whitespace_error_string(result);
- fprintf(stderr, "%s
.\n%s:%d:
%.*s\n",
-
err, patch_input_file, linen
r, len - 2, line + 1);
+ fprintf(stderr, "%s
:%d: %s.\n
%.*s\n",
+
patch_input_file, linenr, er
r, len - 2, line + 1);
free(err);
}
}