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>
René Scharfe committed
Oct 11, 2022 at 11:29 UTC
e3733b646dcec33947aa4658c0ed89a8a4b42c4b
1 file changed
+3
-5
archive.c
+3
-5
@@ -165,18 +165,16 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
165
args->convert = check_attr_export_subst(check);
166
}
167
168
+ if (args->verbose)
169
+ fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
170
+
171
if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
169
- if (args->verbose)
170
- fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
172
err = write_entry(args, oid, path.buf, path.len, mode, NULL, 0);
173
if (err)
174
return err;
175
return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
176
}
177
177
- if (args->verbose)
178
- fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
179
-
178
/* Stream it? */
179
if (S_ISREG(mode) && !args->convert &&
180
oid_object_info(args->repo, oid, &size) == OBJ_BLOB &&