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: <xmqqmtfme8v6.fsf@gitster.g>

* jc/archive-add-file-normalize-mode:
  archive: do not let on-disk mode leak to zip archives
maint
Junio C Hamano 2022-06-08 14:27:51 -07:00
commit 9d1304155b
1 changed files with 1 additions and 1 deletions

View File

@ -342,7 +342,7 @@ int write_archive_entries(struct archiver_args *args,
else else
err = write_entry(args, &fake_oid, path_in_archive.buf, err = write_entry(args, &fake_oid, path_in_archive.buf,
path_in_archive.len, path_in_archive.len,
info->stat.st_mode, canon_mode(info->stat.st_mode),
content.buf, content.len); content.buf, content.len);
if (err) if (err)
break; break;