summaryrefslogtreecommitdiff
path: root/builtin/send-pack.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-29 15:43:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-29 15:43:12 -0700
commit735907bde1de71e2fc90712bdb3bf30fc417a8ac (patch)
tree0d1b59285e312d72caecd9a2183cb42a0d841321 /builtin/send-pack.c
parentMerge branch 'ab/test-bail' (diff)
parenttransport-helper: recognize "expecting report" error from send-pack (diff)
downloadtgif-735907bde1de71e2fc90712bdb3bf30fc417a8ac.tar.xz
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 'builtin/send-pack.c')
-rw-r--r--builtin/send-pack.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 8932142312..69c432ef1a 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -87,6 +87,10 @@ static void print_helper_status(struct ref *ref)
break;
case REF_STATUS_EXPECTING_REPORT:
+ res = "error";
+ msg = "expecting report";
+ break;
+
default:
continue;
}