git apply 报错
TwitchChen opened this issue · 1 comments
TwitchChen commented
RT
PS D:\workspace-mine\nginx> git checkout
Your branch is up-to-date with 'origin/branches/stable-1.14'.
PS D:\workspace-mine\nginx> git apply ..\ngx_healthcheck_module\nginx_healthcheck_for_nginx_1.14+.patch
../ngx_healthcheck_module/nginx_healthcheck_for_nginx_1.14+.patch:9: trailing whitespace.
#if (NGX_HTTP_UPSTREAM_CHECK)
../ngx_healthcheck_module/nginx_healthcheck_for_nginx_1.14+.patch:10: trailing whitespace.
#include "ngx_http_upstream_check_module.h"
../ngx_healthcheck_module/nginx_healthcheck_for_nginx_1.14+.patch:11: trailing whitespace.
#endif
../ngx_healthcheck_module/nginx_healthcheck_for_nginx_1.14+.patch:19: trailing whitespace.
#if (NGX_HTTP_UPSTREAM_CHECK)
../ngx_healthcheck_module/nginx_healthcheck_for_nginx_1.14+.patch:20: trailing whitespace.
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, pc->log, 0,
error: patch failed: src/http/modules/ngx_http_upstream_hash_module.c:9
error: src/http/modules/ngx_http_upstream_hash_module.c: patch does not apply
error: patch failed: src/http/modules/ngx_http_upstream_ip_hash_module.c:9
error: src/http/modules/ngx_http_upstream_ip_hash_module.c: patch does not apply
error: patch failed: src/http/modules/ngx_http_upstream_least_conn_module.c:9
error: src/http/modules/ngx_http_upstream_least_conn_module.c: patch does not apply
error: patch failed: src/http/ngx_http_upstream_round_robin.c:9
error: src/http/ngx_http_upstream_round_robin.c: patch does not apply
error: patch failed: src/http/ngx_http_upstream_round_robin.h:38
error: src/http/ngx_http_upstream_round_robin.h: patch does not apply
error: patch failed: src/stream/ngx_stream_upstream_hash_module.c:8
error: src/stream/ngx_stream_upstream_hash_module.c: patch does not apply
error: patch failed: src/stream/ngx_stream_upstream_least_conn_module.c:8
error: src/stream/ngx_stream_upstream_least_conn_module.c: patch does not apply
error: patch failed: src/stream/ngx_stream_upstream_round_robin.c:9
error: src/stream/ngx_stream_upstream_round_robin.c: patch does not apply
error: patch failed: src/stream/ngx_stream_upstream_round_robin.h:49
error: src/stream/ngx_stream_upstream_round_robin.h: patch does not apply
TwitchChen commented
分支没有切过去，尴尬