undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/archive-dedup-printf' into maint-2.38

Browse Source 
Code simplification.

* rs/archive-dedup-printf:
  archive: deduplicate verbose printing
This commit is contained in:
Junio C Hamano 2022-10-27 15:24:14 -07:00
commit 40d2f93bde
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); 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 (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); err = write_entry(args, oid, path.buf, path.len, mode, NULL, 0);
if (err) if (err)
return err; return err;
return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
} }
if (args->verbose)
fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
/* Stream it? */ /* Stream it? */
if (S_ISREG(mode) && !args->convert && if (S_ISREG(mode) && !args->convert &&
oid_object_info(args->repo, oid, &size) == OBJ_BLOB && oid_object_info(args->repo, oid, &size) == OBJ_BLOB &&