зеркало из https://github.com/microsoft/git.git
Merge branch 'rs/archive-dedup-printf' into maint-2.38
Code simplification. * rs/archive-dedup-printf: archive: deduplicate verbose printing
This commit is contained in:
Коммит
40d2f93bde
|
@ -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 &&
|
||||
|
|
Загрузка…
Ссылка в новой задаче