Skip to content

Commit

Permalink
Merge branch 'jc/archive-add-file-normalize-mode'
Browse files Browse the repository at this point in the history
"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).

* jc/archive-add-file-normalize-mode:
  archive: do not let on-disk mode leak to zip archives
  • Loading branch information
gitster committed May 23, 2022
2 parents 1b8138f + 6a61661 commit 6cd6906
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion archive.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6cd6906

Please sign in to comment.