summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-05-19 13:47:40 +0200
committerSebastian Thiel <byronimo@gmail.com>2016-05-19 13:47:40 +0200
commitbebc4f56f4e9a0bd3e88fcca3d40ece090252e82 (patch)
tree63e53d2e4bb0597d2c743af974d499468c37f31f
parent2376bd397f084902196a929171c7f7869529bffc (diff)
downloadgitpython-bebc4f56f4e9a0bd3e88fcca3d40ece090252e82.tar.gz
Use correct mode for executable files
Fixes #430
-rw-r--r--git/index/fun.py2
-rw-r--r--git/repo/base.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/git/index/fun.py b/git/index/fun.py
index c1026fd6..4dd32b19 100644
--- a/git/index/fun.py
+++ b/git/index/fun.py
@@ -93,7 +93,7 @@ def stat_mode_to_index_mode(mode):
return S_IFLNK
if S_ISDIR(mode) or S_IFMT(mode) == S_IFGITLINK: # submodules
return S_IFGITLINK
- return S_IFREG | 0o644 | (mode & 0o100) # blobs with or without executable bit
+ return S_IFREG | 0o644 | (mode & 0o111) # blobs with or without executable bit
def write_cache(entries, stream, extension_data=None, ShaStreamCls=IndexFileSHA1Writer):
diff --git a/git/repo/base.py b/git/repo/base.py
index e115fd4b..c2bd2a62 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -628,7 +628,7 @@ class Repo(object):
:note:
ignored files will not appear here, i.e. files mentioned in .gitignore
:note:
- This property is expensive, as no cache is involved. To process the result, please
+ This property is expensive, as no cache is involved. To process the result, please
consider caching it yourself."""
return self._get_untracked_files()