Commit d715f13ef89a89f9bb3b175c6f5adeb905310e3c
2020-03-19T17:02:12
use a single verbosity level throughout 'got clone' and 'got fetch'
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/got/got.c b/got/got.c
index 0da589c..9eddd29 100644
--- a/got/got.c
+++ b/got/got.c
@@ -873,17 +873,10 @@ fetch_progress(void *arg, const char *message, off_t packfile_size,
printf("\r");
if (print_size)
printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
- if (print_indexed) {
+ if (print_indexed)
printf("; indexing %d%%", p_indexed);
- if (a->verbosity > 0)
- printf(" (%d/%d)", nobj_indexed, nobj_total);
- }
- if (print_resolved) {
+ if (print_resolved)
printf("; resolving deltas %d%%", p_resolved);
- if (a->verbosity > 0)
- printf(" (%d/%d)", nobj_resolved,
- nobj_total - nobj_loose);
- }
if (print_size || print_indexed || print_resolved)
fflush(stdout);
@@ -1092,12 +1085,9 @@ cmd_clone(int argc, char *argv[])
if (error)
goto done;
- if (verbosity > 1) {
+ if (verbosity >= 0)
printf("Setting %s to %s\n", GOT_REF_HEAD,
got_ref_get_symref_target(symref));
- }
- if (verbosity >= 0)
- printf("Created cloned repository '%s'\n", repo_path);
error = got_ref_write(symref, repo);
got_ref_close(symref);
@@ -1128,8 +1118,13 @@ cmd_clone(int argc, char *argv[])
goto done;
}
n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
- if (n != strlen(gitconfig))
+ if (n != strlen(gitconfig)) {
error = got_ferror(gitconfig_file, GOT_ERR_IO);
+ goto done;
+ }
+
+ if (verbosity >= 0)
+ printf("Created cloned repository '%s'\n", repo_path);
done:
if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
error = got_error_from_errno("close");