mirror of
https://github.com/git/git.git
synced 2024-05-06 00:36:14 +02:00
Merge branch 'jc/archive-add-file-normalize-mode' into next
"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
This commit is contained in:
commit
265bb02f2a
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue