Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-pack-stop-early'

* sp/maint-fetch-pack-stop-early:
  enable "no-done" extension only when fetching over smart-http

* sp/maint-upload-pack-stop-early:
  enable "no-done" extension only when serving over smart-http

diff --cc builtin/fetch-pack.c
index bf9990c,52707a8,b999413..65a8727
--- 1/builtin/fetch-pack.c
--- 2/builtin/fetch-pack.c
--- 3/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@@@ -732,11 -705,12 -696,6 +732,12 @@@@ static struct ref *do_fetch_pack(int fd
                if (args.verbose)
                        fprintf(stderr, "Server supports multi_ack_detailed\n");
                multi_ack = 2;
-                       no_done = 1;
  +             if (server_supports("no-done")) {
  +                     if (args.verbose)
  +                             fprintf(stderr, "Server supports no-done\n");
+ +                     if (args.stateless_rpc)
+ +                             no_done = 1;
  +             }
        }
        else if (server_supports("multi_ack")) {
                if (args.verbose)

diff --cc upload-pack.c
Simple merge