]> granicus.if.org Git - git/commitdiff
Merge branch 'jk/clone-progress-to-stderr'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Oct 2013 20:49:51 +0000 (13:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Oct 2013 20:49:51 +0000 (13:49 -0700)
Some progress and diagnostic messages from "git clone" were
incorrectly sent to the standard output stream, not to the standard
error stream.

* jk/clone-progress-to-stderr:
  clone: always set transport options
  clone: treat "checking connectivity" like other progress
  clone: send diagnostic messages to stderr

1  2 
builtin/clone.c
t/t5601-clone.sh

diff --cc builtin/clone.c
index b708c115a344974b79501ec896ce87ad30905450,63f298be9c991e50e476f21cdbbc333d849a734a..874e0fd0b6e3ea4882783c0b2377016d93bd989d
@@@ -555,8 -556,8 +555,8 @@@ static void update_remote_refs(const st
                if (check_everything_connected_with_transport(iterate_ref_map,
                                                              0, &rm, transport))
                        die(_("remote did not send all necessary objects"));
-               if (0 <= option_verbosity)
-                       printf(_("done.\n"));
+               if (transport->progress)
 -                      fprintf(stderr, _("done\n"));
++                      fprintf(stderr, _("done.\n"));
        }
  
        if (refs) {
Simple merge