mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-18 06:36:09 +02:00
Code

Merge branch 'rs/archive-dedup-printf' 

Code simplification.

* rs/archive-dedup-printf:
  archive: deduplicate verbose printing
This commit is contained in:
Junio C Hamano 2022-10-19 15:38:06 -07:00
parent 179eb1d967 e3733b646d
commit fe9c607509
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archive.c
View File

@ -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 &&