5/10/2023 0 Comments P4merge rest truncated![]() ![]() + found_new_blank_lines_at_end = hunk_linenr Struct image -2540,14 +2542,18 static int apply_one_fragment(struct image *img, struct fragment *frag,Įrror("invalid start of line: '%c'", first) +++ -2447,6 +2447,8 static int apply_one_fragment(struct image *img, struct fragment *frag, "linenr" as a parameter to parse_fragment() and pass it down theĬallchain all the way through, or something like that.ġ files changed, 9 insertions(+), 2 deletions(-)ĭiff -git a/builtin/apply.c b/builtin/apply.c Introducing a new local variable in apply_one_fragment(), or pass Specific purpose of reporting this type of error in the quoted patch,Īnd the field is not used for any other purpose, so it may be a betterįix to either rename it to hunk_linenr and use it directly without Patch file that has the actual offending text. Other types of whitespace errors are reported with the line number in the The offending line that adds new blank lines at the end of the file. ) cheated by reporting the line number of the hunk that contains Subject: apply -whitespace=error: correctly report new blank lines at endĮarlier 77b15bb (apply -whitespace=warn/error: diagnose blank at EOF, Thread overview below | download mbox.gz: | * Re: git apply/am whitespace errors 20:39 5% ` Junio C Hamano 0 siblings, 0 replies 13+ resultsįrom: Junio C Hamano 20:39 UTC ( / raw) "apply -whitespace=warn/error: diagnose blank at EOF" - search results list mirror (unofficial, one of many) help / color / mirror / code / Atom feed Search results ordered by view
0 Comments
Leave a Reply. |