summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-29 19:29:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-29 19:29:10 (GMT)
commit4e10cf9a17467c08754b36683c240fbab69156de (patch)
treedafb753af176f0303e7a65f775004c38c85f08f2 /upload-pack.c
parent07514c83c2b7e6de926ef758905e3f43b4de6bfa (diff)
downloadgit-4e10cf9a17467c08754b36683c240fbab69156de.zip
git-4e10cf9a17467c08754b36683c240fbab69156de.tar.gz
git-4e10cf9a17467c08754b36683c240fbab69156de.tar.bz2
Revert two "no-done" reverts
Last night I had to make these two emergency reverts, but now we have a better understanding of which part of the topic was broken, let's get rid of the revert to fix it correctly. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/upload-pack.c b/upload-pack.c
index eb80dd9..72aa661 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -27,6 +27,7 @@ static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<
static unsigned long oldest_have;
static int multi_ack, nr_our_refs;
+static int no_done;
static int use_thin_pack, use_ofs_delta, use_include_tag;
static int no_progress, daemon_mode;
static int shallow_nr;
@@ -431,6 +432,7 @@ static int get_common_commits(void)
char last_hex[41];
int got_common = 0;
int got_other = 0;
+ int sent_ready = 0;
save_commit_buffer = 0;
@@ -440,10 +442,17 @@ static int get_common_commits(void)
if (!len) {
if (multi_ack == 2 && got_common
- && !got_other && ok_to_give_up())
+ && !got_other && ok_to_give_up()) {
+ sent_ready = 1;
packet_write(1, "ACK %s ready\n", last_hex);
+ }
if (have_obj.nr == 0 || multi_ack)
packet_write(1, "NAK\n");
+
+ if (no_done && sent_ready) {
+ packet_write(1, "ACK %s\n", last_hex);
+ return 0;
+ }
if (stateless_rpc)
exit(0);
got_common = 0;
@@ -457,9 +466,10 @@ static int get_common_commits(void)
got_other = 1;
if (multi_ack && ok_to_give_up()) {
const char *hex = sha1_to_hex(sha1);
- if (multi_ack == 2)
+ if (multi_ack == 2) {
+ sent_ready = 1;
packet_write(1, "ACK %s ready\n", hex);
- else
+ } else
packet_write(1, "ACK %s continue\n", hex);
}
break;
@@ -535,6 +545,8 @@ static void receive_needs(void)
multi_ack = 2;
else if (strstr(line+45, "multi_ack"))
multi_ack = 1;
+ if (strstr(line+45, "no-done"))
+ no_done = 1;
if (strstr(line+45, "thin-pack"))
use_thin_pack = 1;
if (strstr(line+45, "ofs-delta"))
@@ -628,7 +640,7 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
{
static const char *capabilities = "multi_ack thin-pack side-band"
" side-band-64k ofs-delta shallow no-progress"
- " include-tag multi_ack_detailed";
+ " include-tag multi_ack_detailed no-done";
struct object *o = parse_object(sha1);
if (!o)