From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Jan 2010 23:58:58 +0000 (-0800)
Subject: Merge branch 'tc/clone-v-progress'
X-Git-Tag: v1.7.0-rc0~92
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=42aac96763a72b5bac73d34640d3a0c6233027a6;p=git.git

Merge branch 'tc/clone-v-progress'

* tc/clone-v-progress:
  clone: use --progress to force progress reporting
  clone: set transport->verbose when -v/--verbose is used
  git-clone.txt: reword description of progress behaviour
  check stderr with isatty() instead of stdout when deciding to show progress

Conflicts:
	transport.c
---

42aac96763a72b5bac73d34640d3a0c6233027a6
diff --cc transport.c
index 3b489b392,31c88f33a..c3f156ea0
--- a/transport.c
+++ b/transport.c
@@@ -471,15 -469,15 +471,15 @@@ static int fetch_refs_via_pack(struct t
  	struct ref *refs_tmp = NULL;
  
  	memset(&args, 0, sizeof(args));
 -	args.uploadpack = data->uploadpack;
 -	args.keep_pack = data->keep;
 +	args.uploadpack = data->options.uploadpack;
 +	args.keep_pack = data->options.keep;
  	args.lock_pack = 1;
 -	args.use_thin_pack = data->thin;
 -	args.include_tag = data->followtags;
 +	args.use_thin_pack = data->options.thin;
 +	args.include_tag = data->options.followtags;
  	args.verbose = (transport->verbose > 0);
  	args.quiet = (transport->verbose < 0);
- 	args.no_progress = args.quiet || (!transport->progress && !isatty(1));
+ 	args.no_progress = args.quiet || (!transport->progress && !isatty(2));
 -	args.depth = data->depth;
 +	args.depth = data->options.depth;
  
  	for (i = 0; i < nr_heads; i++)
  		origh[i] = heads[i] = xstrdup(to_fetch[i]->name);
diff --cc transport.h
index 97ba2519d,98bb623c4..7a242fe3b
--- a/transport.h
+++ b/transport.h
@@@ -74,14 -26,8 +74,14 @@@ struct transport 
  	int (*disconnect)(struct transport *connection);
  	char *pack_lockfile;
  	signed verbose : 3;
- 	/* Force progress even if the output is not a tty */
+ 	/* Force progress even if stderr is not a tty */
  	unsigned progress : 1;
 +	/*
 +	 * If transport is at least potentially smart, this points to
 +	 * git_transport_options structure to use in case transport
 +	 * actually turns out to be smart.
 +	 */
 +	struct git_transport_options *smart_options;
  };
  
  #define TRANSPORT_PUSH_ALL 1