From: Felipe Contreras Date: Sat, 12 Apr 2014 20:12:53 GMT Subject: [PATCH v9 4/6] transport-helper: check for 'forced update' message Message-ID: <1397333575-11614-5-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1397333575-11614-1-git-send-email-felipe.contreras@gmail.com> So the remote-helpers can tell us when a forced push was needed. Helped-by: Max Horn Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- transport-helper.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/transport-helper.c b/transport-helper.c index f50e84f..86e1679 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -650,7 +650,7 @@ static int push_update_ref_status(struct strbuf *buf, struct ref *remote_refs) { char *refname, *msg; - int status; + int status, forced = 0; if (starts_with(buf->buf, "ok ")) { status = REF_STATUS_OK; @@ -708,6 +708,11 @@ static int push_update_ref_status(struct strbuf *buf, free(msg); msg = NULL; } + else if (!strcmp(msg, "forced update")) { + forced = 1; + free(msg); + msg = NULL; + } } if (*ref) @@ -729,6 +734,7 @@ static int push_update_ref_status(struct strbuf *buf, } (*ref)->status = status; + (*ref)->forced_update |= forced; (*ref)->remote_status = msg; return !(status == REF_STATUS_OK); } -- 1.9.1+fc3.9.gc73078e