Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
transport-helper: check for 'forced update' message
author
Felipe Contreras
<felipe.contreras@gmail.com>
Tue, 12 Nov 2013 20:56:57 +0000
(14:56 -0600)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 12 Nov 2013 21:34:48 +0000
(13:34 -0800)
So the remote-helpers can tell us when a forced push was needed.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
transport-helper.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
510fa6f
)
diff --git
a/transport-helper.c
b/transport-helper.c
index bcf5469bcc01577019321855f3f539ae9f450f34..abe4c3c2c2ae29488d0d6f0a46424409f14a39cf 100644
(file)
--- 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);
}