diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-27 22:24:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-27 22:24:14 (GMT) |
| commit | 40d2f93bde0d7f256eea28ed940a8855432fa5d6 (patch) | |
| tree | 66ae2d02e6b7a7b5b482593366cf18d877a82ea9 | |
| parent | 4532cd8377200093be5dea53a44aea73f8465423 (diff) | |
| parent | e3733b646dcec33947aa4658c0ed89a8a4b42c4b (diff) | |
| download | git-40d2f93bde0d7f256eea28ed940a8855432fa5d6.zip git-40d2f93bde0d7f256eea28ed940a8855432fa5d6.tar.gz git-40d2f93bde0d7f256eea28ed940a8855432fa5d6.tar.bz2 | |
Merge branch 'rs/archive-dedup-printf' into maint-2.38
Code simplification.
* rs/archive-dedup-printf:
archive: deduplicate verbose printing
| -rw-r--r-- | archive.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -166,18 +166,16 @@ static int write_archive_entry(const struct object_id *oid, const char *base, args->convert = check_attr_export_subst(check); } + if (args->verbose) + fprintf(stderr, "%.*s\n", (int)path.len, path.buf); + if (S_ISDIR(mode) || S_ISGITLINK(mode)) { - if (args->verbose) - fprintf(stderr, "%.*s\n", (int)path.len, path.buf); err = write_entry(args, oid, path.buf, path.len, mode, NULL, 0); if (err) return err; return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); } - if (args->verbose) - fprintf(stderr, "%.*s\n", (int)path.len, path.buf); - /* Stream it? */ if (S_ISREG(mode) && !args->convert && oid_object_info(args->repo, oid, &size) == OBJ_BLOB && |