diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-01 19:41:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-01 19:41:00 -0700 |
| commit | a4103bac37d92a13fc47797c3d02becc7800e577 (patch) | |
| tree | 0d0143a202633e5f2b9a7b7034112ed47b7965b5 /upload-pack.c | |
| parent | 59773c7e583b1dcf4b63c4ee222b79cef460456b (diff) | |
| parent | 2ff4d1ab9ef6660c88020ddaadc410157e130cdc (diff) | |
Merge branch 'js/daemon-log'
* js/daemon-log:
receive-pack: do not send error details to the client
upload-pack: squelch progress indicator if client cannot see it
daemon: send stderr of service programs to the syslog
Diffstat (limited to 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index edc7861228..841ebb534a 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -28,7 +28,7 @@ static unsigned long oldest_have; static int multi_ack, nr_our_refs; 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 want_obj; static unsigned int timeout; @@ -521,6 +521,10 @@ static void receive_needs(void) } if (debug_fd) write_in_full(debug_fd, "#E\n", 3); + + if (!use_sideband && daemon_mode) + no_progress = 1; + if (depth == 0 && shallows.nr == 0) return; if (depth > 0) { @@ -630,6 +634,7 @@ int main(int argc, char **argv) } if (!prefixcmp(arg, "--timeout=")) { timeout = atoi(arg+10); + daemon_mode = 1; continue; } if (!strcmp(arg, "--")) { |