Skip to content

Commit f94a84c

Browse files
gitstergitster
committed
Merge branch 'jk/clone-progress-to-stderr'
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
2 parents 039048e + 643f918 commit f94a84c

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

‎builtin/clone.c‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ static void clone_local(const char *src_repo, const char *dest_repo)
379379
}
380380

381381
if (0 <= option_verbosity)
382-
printf(_("done.\n"));
382+
fprintf(stderr, _("done.\n"));
383383
}
384384

385385
static const char *junk_work_tree;
@@ -550,13 +550,13 @@ static void update_remote_refs(const struct ref *refs,
550550
const struct ref *rm = mapped_refs;
551551

552552
if (check_connectivity) {
553-
if (0 <= option_verbosity)
554-
printf(_("Checking connectivity... "));
553+
if (transport->progress)
554+
fprintf(stderr, _("Checking connectivity... "));
555555
if (check_everything_connected_with_transport(iterate_ref_map,
556556
0, &rm, transport))
557557
die(_("remote did not send all necessary objects"));
558-
if (0 <= option_verbosity)
559-
printf(_("done.\n"));
558+
if (transport->progress)
559+
fprintf(stderr, _("done.\n"));
560560
}
561561

562562
if (refs) {
@@ -849,9 +849,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
849849

850850
if (0 <= option_verbosity) {
851851
if (option_bare)
852-
printf(_("Cloning into bare repository '%s'...\n"), dir);
852+
fprintf(stderr, _("Cloning into bare repository '%s'...\n"), dir);
853853
else
854-
printf(_("Cloning into '%s'...\n"), dir);
854+
fprintf(stderr, _("Cloning into '%s'...\n"), dir);
855855
}
856856
init_db(option_template, INIT_DB_QUIET);
857857
write_config(&option_config);
@@ -884,27 +884,25 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
884884
remote = remote_get(option_origin);
885885
transport = transport_get(remote, remote->url[0]);
886886

887-
if (!is_local) {
888-
if (!transport->get_refs_list || !transport->fetch)
889-
die(_("Don't know how to clone %s"), transport->url);
887+
if (!transport->get_refs_list || (!is_local && !transport->fetch))
888+
die(_("Don't know how to clone %s"), transport->url);
890889

891-
transport_set_option(transport, TRANS_OPT_KEEP, "yes");
890+
transport_set_option(transport, TRANS_OPT_KEEP, "yes");
892891

893-
if (option_depth)
894-
transport_set_option(transport, TRANS_OPT_DEPTH,
895-
option_depth);
896-
if (option_single_branch)
897-
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
892+
if (option_depth)
893+
transport_set_option(transport, TRANS_OPT_DEPTH,
894+
option_depth);
895+
if (option_single_branch)
896+
transport_set_option(transport, TRANS_OPT_FOLLOWTAGS, "1");
898897

899-
transport_set_verbosity(transport, option_verbosity, option_progress);
898+
transport_set_verbosity(transport, option_verbosity, option_progress);
900899

901-
if (option_upload_pack)
902-
transport_set_option(transport, TRANS_OPT_UPLOADPACK,
903-
option_upload_pack);
900+
if (option_upload_pack)
901+
transport_set_option(transport, TRANS_OPT_UPLOADPACK,
902+
option_upload_pack);
904903

905-
if (transport->smart_options && !option_depth)
906-
transport->smart_options->check_self_contained_and_connected = 1;
907-
}
904+
if (transport->smart_options && !option_depth)
905+
transport->smart_options->check_self_contained_and_connected = 1;
908906

909907
refs = transport_get_remote_refs(transport);
910908

‎t/t5601-clone.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test_expect_success 'clone with excess parameters (2)' '
3636

3737
test_expect_success C_LOCALE_OUTPUT 'output from clone' '
3838
rm -fr dst &&
39-
git clone -n "file://$(pwd)/src" dst >output &&
39+
git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
4040
test $(grep Clon output | wc -l) = 1
4141
'
4242

‎t/t5701-clone-local.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,8 @@ test_expect_success 'cloning a local path with --no-local does not hardlink' '
134134
! repo_is_hardlinked force-nonlocal
135135
'
136136

137+
test_expect_success 'cloning locally respects "-u" for fetching refs' '
138+
test_must_fail git clone --bare -u false a should_not_work.git
139+
'
140+
137141
test_done

‎t/t5702-clone-options.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,19 @@ test_expect_success 'clone -o' '
1919
2020
'
2121

22-
test_expect_success 'redirected clone' '
22+
test_expect_success 'redirected clone does not show progress' '
2323
2424
git clone "file://$(pwd)/parent" clone-redirected >out 2>err &&
25-
test_must_be_empty err
25+
! grep % err &&
26+
test_i18ngrep ! "Checking connectivity" err
2627
2728
'
28-
test_expect_success 'redirected clone -v' '
29+
30+
test_expect_success 'redirected clone -v does show progress' '
2931
3032
git clone --progress "file://$(pwd)/parent" clone-redirected-progress \
3133
>out 2>err &&
32-
test -s err
34+
grep % err
3335
3436
'
3537

0 commit comments

Comments
 (0)