[PATCH v5 04/10] transport-helper: check for 'forced update' message
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:59:09
Subsystem:
the rest · Maintainer:
Linus Torvalds
So the remote-helpers can tell us when a forced push was needed. Signed-off-by: Felipe Contreras <redacted> --- transport-helper.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/transport-helper.c b/transport-helper.c
index ed238e5..5aba15c 100644
--- a/transport-helper.c
+++ b/transport-helper.c@@ -643,7 +643,7 @@ static int push_update_ref_status(struct strbuf *buf, struct ref *remote_refs) { char *refname, *msg; - int status; + int status, forced = 0; if (!prefixcmp(buf->buf, "ok ")) { status = REF_STATUS_OK;
@@ -701,6 +701,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)
@@ -722,6 +727,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.8.4.2+fc1