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

diff --cc builtin-clone.c
Simple merge

diff --cc transport-helper.c
Simple merge

diff --cc transport.c
index 3b489b392b90ecbbabeae5d736527f83eba18cb4,31c88f33a567d403859dd00a33c8f51ab31b030f..c3f156ea04636a722a49aca225175a6f9e9259c9
--- 1/transport.c
--- 2/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 97ba2519dd6db2a4341def590e06cbc81b33fed2,98bb623c4549ec90a749ce02aa3455e3966ed780..7a242fe3bd68e55e5807268e5c381c3c89f96a47
--- 1/transport.h
--- 2/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