mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/checkdiff'

Browse Source 
* jc/checkdiff:
  Fix t4017-diff-retval for white-space from wc
  Update sample pre-commit hook to use "diff --check"
  diff --check: detect leftover conflict markers
  Teach "diff --check" about new blank lines at end
  checkdiff: pass diff_options to the callback
  check_and_emit_line(): rename and refactor
  diff --check: explain why we do not care whether old side is binary
This commit is contained in:
Junio C Hamano
2008-07-01 16:22:35 -07:00
parent f7c3cf8106 ab20fda992
commit d4b76e15ea
7 changed files with 136 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin-apply.c
View File

@ -987,8 +987,7 @@ static int find_header(char *line, unsigned long size, int *hdrsize, struct patc
static void check_whitespace(const char *line, int len, unsigned ws_rule)
{
char *err;
unsigned result = check_and_emit_line(line + 1, len - 1, ws_rule,
NULL, NULL, NULL, NULL);
unsigned result = ws_check(line + 1, len - 1, ws_rule);
if (!result)
return;
@ -999,7 +998,7 @@ static void check_whitespace(const char *line, int len, unsigned ws_rule)
else {
err = whitespace_error_string(result);
fprintf(stderr, "%s:%d: %s.\n%.*s\n",
patch_input_file, linenr, err, len - 2, line + 1);
patch_input_file, linenr, err, len - 2, line + 1);
free(err);
}
}