From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Mar 2011 21:09:02 +0000 (-0700)
Subject: Merge branches 'sp/maint-fetch-pack-stop-early' and 'sp/maint-upload-pack-stop-early'
X-Git-Tag: v1.7.5-rc0~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2eee1393f39953d27b63070fdb5c533082f28f0c;p=git.git

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
---

2eee1393f39953d27b63070fdb5c533082f28f0c
diff --cc builtin/fetch-pack.c
index bf9990ce1,52707a80a,b99941393..65a872745
--- a/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;
  +		if (server_supports("no-done")) {
  +			if (args.verbose)
  +				fprintf(stderr, "Server supports no-done\n");
-  			no_done = 1;
+ +			if (args.stateless_rpc)
+ +				no_done = 1;
  +		}
   	}
   	else if (server_supports("multi_ack")) {
   		if (args.verbose)