diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-06 08:56:07 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-06 08:56:07 -0700 |
| commit | 276328ffb87cefdc515bee5f09916aea6e0244ed (patch) | |
| tree | 162b276adac033e8a41266071e046f0f4cf4cd6d /transport.c | |
| parent | 048f2762007d022defceb6850a44bc1bd5ccebf7 (diff) | |
| parent | e261cf94848d31868c21fb11cade51c30dfcdbe7 (diff) | |
| download | git-276328ffb87cefdc515bee5f09916aea6e0244ed.tar.gz git-276328ffb87cefdc515bee5f09916aea6e0244ed.tar.xz | |
Merge branch 'maint'
* maint:
Update release notes for 1.6.0.3
Teach rebase -i to honor pre-rebase hook
docs: describe pre-rebase hook
do not segfault if make_cache_entry failed
make prefix_path() never return NULL
fix bogus "diff --git" header from "diff --no-index"
Fix fetch/clone --quiet when stdout is connected
builtin-blame: Fix blame -C -C with submodules.
bash: remove fetch, push, pull dashed form leftovers
Conflicts:
diff.c
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/transport.c b/transport.c index f7db5d911..5110c56c4 100644 --- a/transport.c +++ b/transport.c @@ -643,8 +643,8 @@ static int fetch_refs_via_pack(struct transport *transport, args.use_thin_pack = data->thin; args.include_tag = data->followtags; args.verbose = (transport->verbose > 0); - args.quiet = args.no_progress = (transport->verbose < 0); - args.no_progress = !isatty(1); + args.quiet = (transport->verbose < 0); + args.no_progress = args.quiet || !isatty(1); args.depth = data->depth; for (i = 0; i < nr_heads; i++) |