[PATCH v3 4/7] transport-helper: update ref status for "force-if-includes"
- From
Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
- Date
- Sep 13, 2020, 14:54 UTC
- Message-ID
- <20200913145413.18351-5-shrinidhi.kaushik@gmail.com>
- In-Reply-To
- <20200913145413.18351-1-shrinidhi.kaushik@gmail.com>
Update "push_update_refs_status" to map the string equivalent of the ref status "REF_STATUS_REJECT_REMOTE_UPDATED" when set if a `git-push` fails for "--force-if-includes".
Signed-off-by: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com> --- transport-helper.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/transport-helper.c b/transport-helper.c index c52c99d829..e547e21199 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -779,6 +779,10 @@ static int push_update_ref_status(struct strbuf *buf, status = REF_STATUS_REJECT_STALE; FREE_AND_NULL(msg); } + else if (!strcmp(msg, "remote ref updated since checkout")) { + status = REF_STATUS_REJECT_REMOTE_UPDATED; + FREE_AND_NULL(msg); + } else if (!strcmp(msg, "forced update")) { forced = 1; FREE_AND_NULL(msg); @@ -897,6 +901,7 @@ static int push_refs_with_push(struct transport *transport, case REF_STATUS_REJECT_NONFASTFORWARD: case REF_STATUS_REJECT_STALE: case REF_STATUS_REJECT_ALREADY_EXISTS: + case REF_STATUS_REJECT_REMOTE_UPDATED: if (atomic) { reject_atomic_push(remote_refs, mirror); string_list_clear(&cas_options, 0);
-- 2.28.0