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

Merge branch 'bc/maint-apply-check-no-patch'

Browse Source 
* bc/maint-apply-check-no-patch:
  builtin/apply.c: report error on failure to recognize input
  t/t4131-apply-fake-ancestor.sh: fix broken test
This commit is contained in:
Junio C Hamano
2011-12-13 22:56:22 -08:00
parent 424f30a5ae cc64b318f2
commit b661a4bc1e
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/apply.c
View File

@ -3587,15 +3587,12 @@ static int write_out_one_reject(struct patch *patch)
return -1;
}
static int write_out_results(struct patch *list, int skipped_patch)
static int write_out_results(struct patch *list)
{
int phase;
int errs = 0;
struct patch *l;
if (!list && !skipped_patch)
return error("No changes");
for (phase = 0; phase < 2; phase++) {
l = list;
while (l) {
@ -3721,6 +3718,9 @@ static int apply_patch(int fd, const char *filename, int options)
offset += nr;
}
if (!list && !skipped_patch)
die("unrecognized input");
if (whitespace_error && (ws_error_action == die_on_ws_error))
apply = 0;
@ -3738,7 +3738,7 @@ static int apply_patch(int fd, const char *filename, int options)
!apply_with_reject)
exit(1);
if (apply && write_out_results(list, skipped_patch))
if (apply && write_out_results(list))
exit(1);
if (fake_ancestor)