mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upload-pack: squelch progress indicator if client cannot see it

Browse Source 
upload-pack runs pack-objects, which generates progress indicator output
on its stderr. If the client requests a sideband, this indicator is sent
to the client; but if it did not, then the progress is written to
upload-pack's own stderr.

If upload-pack is itself run from git-daemon (and if the client did not
request a sideband) the progress indicator never reaches the client and it
need not be generated in the first place. With this patch the progress
indicator is suppressed in this situation.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt
2009-06-16 20:41:16 +02:00
committed by Junio C Hamano
parent 5d87dd4fca
commit 9462e3f59c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
upload-pack.c
View File

@ -28,7 +28,7 @@ static unsigned long oldest_have;
static int multi_ack, nr_our_refs; static int multi_ack, nr_our_refs;
static int use_thin_pack, use_ofs_delta, use_include_tag; static int use_thin_pack, use_ofs_delta, use_include_tag;
static int no_progress; static int no_progress, daemon_mode;
static struct object_array have_obj; static struct object_array have_obj;
static struct object_array want_obj; static struct object_array want_obj;
static unsigned int timeout; static unsigned int timeout;
@ -521,6 +521,10 @@ static void receive_needs(void)
} }
if (debug_fd) if (debug_fd)
write_in_full(debug_fd, "#E\n", 3); write_in_full(debug_fd, "#E\n", 3);
if (!use_sideband && daemon_mode)
no_progress = 1;
if (depth == 0 && shallows.nr == 0) if (depth == 0 && shallows.nr == 0)
return; return;
if (depth > 0) { if (depth > 0) {
@ -630,6 +634,7 @@ int main(int argc, char **argv)
} }
if (!prefixcmp(arg, "--timeout=")) { if (!prefixcmp(arg, "--timeout=")) {
timeout = atoi(arg+10); timeout = atoi(arg+10);
daemon_mode = 1;
continue; continue;
} }
if (!strcmp(arg, "--")) { if (!strcmp(arg, "--")) {