X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=fetch-pack.c;h=474d54520eae356a8987349b1e36186a30914966;hb=ba7545adab83e6bea43353937eabb467bcb7d4f7;hp=1b2d6ee20d16d03a59d2cd2aafb46e9a03c492b0;hpb=56f9686c4d1e1d586b731b815bd98d70f84ecda4;p=git.git diff --git a/fetch-pack.c b/fetch-pack.c index 1b2d6ee20..474d54520 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -166,12 +166,13 @@ static int find_common(int fd[2], unsigned char *result_sha1, } if (!fetching) - packet_write(fd[1], "want %s%s%s%s%s\n", + packet_write(fd[1], "want %s%s%s%s%s%s\n", sha1_to_hex(remote), (multi_ack ? " multi_ack" : ""), (use_sideband == 2 ? " side-band-64k" : ""), (use_sideband == 1 ? " side-band" : ""), - (use_thin_pack ? " thin-pack" : "")); + (use_thin_pack ? " thin-pack" : ""), + " ofs-delta"); else packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); fetching++; @@ -525,7 +526,7 @@ int main(int argc, char **argv) ret = fetch_pack(fd, nr_heads, heads); close(fd[0]); close(fd[1]); - finish_connect(pid); + ret |= finish_connect(pid); if (!ret && nr_heads) { /* If the heads to pull were given, we should have @@ -540,5 +541,5 @@ int main(int argc, char **argv) } } - return ret; + return !!ret; }