Skip to content

Commit 9d13041

Browse files
committed
Merge branch 'jc/archive-add-file-normalize-mode' into maint
"git archive --add-file=<path>" picked up the raw permission bits from the path and propagated to zip output in some cases, without normalization, which has been corrected (tar output did not have this issue). source: <[email protected]> * jc/archive-add-file-normalize-mode: archive: do not let on-disk mode leak to zip archives
2 parents c47b89c + 6a61661 commit 9d13041

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

archive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ int write_archive_entries(struct archiver_args *args,
342342
else
343343
err = write_entry(args, &fake_oid, path_in_archive.buf,
344344
path_in_archive.len,
345-
info->stat.st_mode,
345+
canon_mode(info->stat.st_mode),
346346
content.buf, content.len);
347347
if (err)
348348
break;

0 commit comments

Comments
 (0)