diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-29 22:43:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-29 22:43:12 (GMT) |
| commit | 735907bde1de71e2fc90712bdb3bf30fc417a8ac (patch) | |
| tree | 0d1b59285e312d72caecd9a2183cb42a0d841321 /transport-helper.c | |
| parent | 8ba651b56e5916d864b2a5c4cce8d4e445b87e17 (diff) | |
| parent | c5c3486f38af50e3d63b3bd1d1d25773e4f4420a (diff) | |
| download | git-735907bde1de71e2fc90712bdb3bf30fc417a8ac.zip git-735907bde1de71e2fc90712bdb3bf30fc417a8ac.tar.gz git-735907bde1de71e2fc90712bdb3bf30fc417a8ac.tar.bz2 | |
Merge branch 'jk/http-push-status-fix'
"git push" client talking to an HTTP server did not diagnose the
lack of the final status report from the other side correctly,
which has been corrected.
* jk/http-push-status-fix:
transport-helper: recognize "expecting report" error from send-pack
send-pack: complain about "expecting report" with --helper-status
Diffstat (limited to 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/transport-helper.c b/transport-helper.c index e8dbdd1..a0297b0 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -845,6 +845,10 @@ static int push_update_ref_status(struct strbuf *buf, forced = 1; FREE_AND_NULL(msg); } + else if (!strcmp(msg, "expecting report")) { + status = REF_STATUS_EXPECTING_REPORT; + FREE_AND_NULL(msg); + } } if (state->hint) |