Commit 14dd881

committed

improve index mode for executable files

The fix for #430 in bebc4f5 (Use correct mode for executable files, 2016年05月19日) is incomplete. It fails (in most cases) when files have modes which are not exactly 0644 or 0755. As git only cares about executable or or not in this case, ensure the mode we set for the index is either 100644 or 100755. Do this similarly to how upstream git does it in cache.h1. Fixes #1253 1 https://github.com/git/git/blob/v2.31.1/cache.h#L247

1 parent eae0e37 commit 14dd881Copy full SHA for 14dd881

File tree

1 file changed

-1

lines changed

git/index
- fun.py

1 file changed

-1

lines changed

`‎git/index/fun.py‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`S_ISDIR,`
`12`	`12`	`S_IFMT,`
`13`	`13`	`S_IFREG,`
	`14`	`+ S_IXUSR,`
`14`	`15`	`)`
`15`	`16`	`import subprocess`
`16`	`17`
`@@ -115,7 +116,7 @@ def stat_mode_to_index_mode(mode):`
`115`	`116`	`return S_IFLNK`
`116`	`117`	`if S_ISDIR(mode) or S_IFMT(mode) == S_IFGITLINK: # submodules`
`117`	`118`	`return S_IFGITLINK`
`118`		`- return S_IFREG \| 0o644\|(mode & 0o111) # blobs with or without executable bit`
	`119`	`+ return S_IFREG \| (mode & S_IXUSRand0o755or0o644) # blobs with or without executable bit`
`119`	`120`
`120`	`121`
`121`	`122`	`def write_cache(entries: Sequence[Union[BaseIndexEntry, 'IndexEntry']], stream: IO[bytes],`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 14dd881

File tree

1 file changed

1 file changed

`‎git/index/fun.py‎`

0 commit comments