diff options
| author | Yobmod <yobmod@gmail.com> | 2021-06-17 17:29:37 +0100 |
|---|---|---|
| committer | Yobmod <yobmod@gmail.com> | 2021-06-17 17:29:37 +0100 |
| commit | 636f77bf8d58a482df0bde8c0a6a8828950a0788 (patch) | |
| tree | e1207dbe034f82deacbb76369716779608e7056d /git/index/fun.py | |
| parent | 567c892322776756e8d0095e89f39b25b9b01bc2 (diff) | |
| parent | b0f79c58ad919e90261d1e332df79a4ad0bc40de (diff) | |
| download | gitpython-636f77bf8d58a482df0bde8c0a6a8828950a0788.tar.gz | |
fix conflict
Diffstat (limited to 'git/index/fun.py')
| -rw-r--r-- | git/index/fun.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git/index/fun.py b/git/index/fun.py index 96d9b475..3fded347 100644 --- a/git/index/fun.py +++ b/git/index/fun.py @@ -11,6 +11,7 @@ from stat import ( S_ISDIR, S_IFMT, S_IFREG, + S_IXUSR, ) import subprocess @@ -115,7 +116,7 @@ def stat_mode_to_index_mode(mode: int) -> int: return S_IFLNK if S_ISDIR(mode) or S_IFMT(mode) == S_IFGITLINK: # submodules return S_IFGITLINK - return S_IFREG | 0o644 | (mode & 0o111) # blobs with or without executable bit + return S_IFREG | (mode & S_IXUSR and 0o755 or 0o644) # blobs with or without executable bit def write_cache(entries: Sequence[Union[BaseIndexEntry, 'IndexEntry']], stream: IO[bytes], |