From: Junio C Hamano Date: Thu, 12 May 2022 21:31:09 +0000 (-0700) Subject: archive: do not let on-disk mode leak to zip archives X-Git-Tag: v2.36.2~11^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a616619679d78e116f775a37094c15e1f824775;p=thirdparty%2Fgit.git archive: do not let on-disk mode leak to zip archives When the "--add-file" option is used to add the contents from an untracked file to the archive, the permission mode bits for these files are sent to the archive-backend specific "write_entry()" method as-is. We normalize the mode bits for tracked files way before we pass them to the write_entry() method; we should do the same here. This is not strictly needed for "tar" archive-backend, as it has its own code to further clean them up, but "zip" archive-backend is not so well prepared. Signed-off-by: Junio C Hamano --- diff --git a/archive.c b/archive.c index e29d0e00f6..12a08af531 100644 --- a/archive.c +++ b/archive.c @@ -342,7 +342,7 @@ int write_archive_entries(struct archiver_args *args, else err = write_entry(args, &fake_oid, path_in_archive.buf, path_in_archive.len, - info->stat.st_mode, + canon_mode(info->stat.st_mode), content.buf, content.len); if (err) break;