Merge branch 'ys/bisect-object-id-missing-conversion-fix' into next

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 2bf7f2d1a3e589f982400fef1aa5bec6e97ccfbd..79e82f9c1cf6fb4bff005cc38ea33a34819c64a7 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1964,6 +1964,12 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
                unpack_limit = receive_unpack_limit;
 
        switch (determine_protocol_version_server()) {
+       case protocol_v2:
+               /*
+                * push support for protocol v2 has not been implemented yet,
+                * so ignore the request to use v2 and fallback to using v0.
+                */
+               break;
        case protocol_v1:
                /*
                 * v1 is just the original protocol with a version string,