summaryrefslogtreecommitdiff
path: root/Documentation/git-upload-pack.txt
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2007-02-23 19:03:10 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-24 08:26:18 (GMT)
commitb0e908977ebe43b49badad7fe34bf259dd5d263b (patch)
tree7b4e75862793dd292a7ad8323d3fa51be0bafb46 /Documentation/git-upload-pack.txt
parent83a5ad61268bbfea7e0d3180528366690f951554 (diff)
downloadgit-b0e908977ebe43b49badad7fe34bf259dd5d263b.zip
git-b0e908977ebe43b49badad7fe34bf259dd5d263b.tar.gz
git-b0e908977ebe43b49badad7fe34bf259dd5d263b.tar.bz2
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 'Documentation/git-upload-pack.txt')
-rw-r--r--Documentation/git-upload-pack.txt5
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index c75c86e..fd65192 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -8,7 +8,7 @@ git-upload-pack - Send objects packed back to git-fetch-pack
SYNOPSIS
--------
-'git-upload-pack' [--strict] [--timeout=<n>] [--no-progress] <directory>
+'git-upload-pack' [--strict] [--timeout=<n>] <directory>
DESCRIPTION
-----------
@@ -30,9 +30,6 @@ OPTIONS
\--timeout=<n>::
Interrupt transfer after <n> seconds of inactivity.
-\--no-progress::
- Do not show the progress.
-
<directory>::
The repository to sync from.