diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-02-23 20:03:10 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-24 00:26:18 -0800 |
| commit | b0e908977ebe43b49badad7fe34bf259dd5d263b (patch) | |
| tree | 7b4e75862793dd292a7ad8323d3fa51be0bafb46 /fetch-pack.c | |
| parent | 83a5ad61268bbfea7e0d3180528366690f951554 (diff) | |
| download | git-b0e908977ebe43b49badad7fe34bf259dd5d263b.tar.gz git-b0e908977ebe43b49badad7fe34bf259dd5d263b.tar.xz | |
Fixup no-progress for fetch & clone
The intent of the commit 'fetch & clone: do not output progress when
not on a tty' was to make fetching and cloning less chatty when
output was not redirected (such as in a cron job).
However, there was a serious thinko in that commit. It assumed that
the client _and_ the server got this update at the same time. But
this is obviously not the case, and therefore upload-pack died on
seeing the option "--no-progress".
This patch fixes that issue by making it a protocol option. So, until
your server is updated, you still see the progress, but once the
server has this patch, it will be quiet.
A minor issue was also fixed: when cloning, the checkout did not
heed no_progress.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index fc6b4e06b..842854627 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -174,12 +174,13 @@ static int find_common(int fd[2], unsigned char *result_sha1, } if (!fetching) - packet_write(fd[1], "want %s%s%s%s%s%s\n", + packet_write(fd[1], "want %s%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" : ""), + (no_progress ? " no-progress" : ""), " ofs-delta"); else packet_write(fd[1], "want %s\n", sha1_to_hex(remote)); @@ -732,12 +733,7 @@ int main(int argc, char **argv) } if (!dest) usage(fetch_pack_usage); - if (no_progress) { - char buf[256]; - snprintf(buf, sizeof(buf), "%s --no-progress", uploadpack); - pid = git_connect(fd, dest, buf); - } else - pid = git_connect(fd, dest, uploadpack); + pid = git_connect(fd, dest, uploadpack); if (pid < 0) return 1; if (heads && nr_heads) |