W dniu 28.03.2015 o 08:21, Darshit Shah pisze: > Git still complains about at least 7 white space issues when applying > your two patches. Could you please take a look? > > >> From 022d6d38aa3b2d1b07be907f101a4212db384fbf Mon Sep 17 00:00:00 2001 >> From: Hubert Tarasiuk <[email protected]> >> Date: Fri, 27 Mar 2015 14:00:33 +0100 >> Subject: [PATCH 1/2] Factor out set_content_type function from gethttp >> >> * src/http.c (gethttp): Move some code in... >> (set_content_type): ... a new function. >> --- >> src/http.c | 37 ++++++++++++++++++++++--------------- >> 1 file changed, 22 insertions(+), 15 deletions(-) >> >> diff --git a/src/http.c b/src/http.c >> index 53c9818..97bfa7a 100644 >> --- a/src/http.c >> +++ b/src/http.c >> @@ -2330,6 +2330,27 @@ open_output_stream (struct http_stat *hs, int >> count, FILE **fp) >> return RETROK; >> } >> >> +/* Set proper type flags based on type string. */ >> +static void >> +set_content_type (int *dt, const char *type) >> +{ >> + /* If content-type is not given, assume text/html. This is because >> + of the multitude of broken CGI's that "forget" to generate the >> + content-type. */ > There's a whitespace issue here which causes git to perform all sorts of > ugly mangling with the lines. > > The rest of the patches seem good. > Can you help me to reproduce the problem? I am doing $ git checkout origin/master $ git apply --whitespace=error 0001-Factor-out-set_content_type-function-from-gethttp.patch $ git apply --whitespace=error 0002-Transform-read_header-label-and-goto-into-a-loop.patch And I do not get any warnings or errors.
signature.asc
Description: OpenPGP digital signature
