diff options
| author | René Scharfe <l.s.r@web.de> | 2022-10-11 11:29:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-11 17:35:10 +0200 |
| commit | e3733b646dcec33947aa4658c0ed89a8a4b42c4b (patch) | |
| tree | c42e83c32236639f000e5523f2bbb4f032947c96 | |
| parent | Git 2.35.4 (diff) | |
| download | git-e3733b646dcec33947aa4658c0ed89a8a4b42c4b.tar.xz git-e3733b646dcec33947aa4658c0ed89a8a4b42c4b.zip | |
archive: deduplicate verbose printing
94bc671a1f (Add directory pattern matching to attributes, 2012-12-08)
moved the code for adding the trailing slash to names of directories and
submodules up. This left both branches of the if statement starting
with the same conditional fprintf call. Deduplicate it.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | archive.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -165,18 +165,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 && |