upload-pack: squelch progress indicator if client cannot see it
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>
Johannes Sixt committed
Jun 16, 2009 at 20:41 UTC
9462e3f59cd5a545330a9490a27d68b79f1d0ce7
1 file changed
+6
-1
upload-pack.c
+6
-1
@@ -28,7 +28,7 @@ static unsigned long oldest_have;
28
29
static int multi_ack, nr_our_refs;
30
static int use_thin_pack, use_ofs_delta, use_include_tag;
31
-static int no_progress;
31
+static int no_progress, daemon_mode;
32
static struct object_array have_obj;
33
static struct object_array want_obj;
34
static unsigned int timeout;
@@ -521,6 +521,10 @@ static void receive_needs(void)
521
}
522
if (debug_fd)
523
write_in_full(debug_fd, "#E\n", 3);
524
+
525
+ if (!use_sideband && daemon_mode)
526
+ no_progress = 1;
527
+
528
if (depth == 0 && shallows.nr == 0)
529
return;
530
if (depth > 0) {
@@ -630,6 +634,7 @@ int main(int argc, char **argv)
634
}
635
if (!prefixcmp(arg, "--timeout=")) {
636
timeout = atoi(arg+10);
637
+ daemon_mode = 1;
638
continue;
639
}
640
if (!strcmp(arg, "--")) {