summaryrefslogtreecommitdiff
path: root/src/submodule.c
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2013-10-08 17:03:12 -0700
committerVicent Martí <vicent@github.com>2013-10-08 17:03:12 -0700
commit95c148b2c772b5f97e0db60bff089d8fa944971c (patch)
tree18695995886b76a7c7e4e3fc0447bdfe7300bc63 /src/submodule.c
parent062c95c2a9265cab8039c02a978944cd672017e5 (diff)
parent867f7c9b3329952dc0aebf9770019a7a01ff2691 (diff)
downloadlibgit2-95c148b2c772b5f97e0db60bff089d8fa944971c.tar.gz
Merge pull request #1886 from libgit2/precompose-utf8
Add support for core.precomposeunicode on Mac
Diffstat (limited to 'src/submodule.c')
-rw-r--r--src/submodule.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/submodule.c b/src/submodule.c
index 121383b9c..12ade83fe 100644
--- a/src/submodule.c
+++ b/src/submodule.c
@@ -372,7 +372,8 @@ int git_submodule_add_to_index(git_submodule *sm, int write_index)
memset(&entry, 0, sizeof(entry));
entry.path = sm->path;
- git_index_entry__init_from_stat(&entry, &st);
+ git_index_entry__init_from_stat(
+ &entry, &st, !(git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE));
/* calling git_submodule_open will have set sm->wd_oid if possible */
if ((sm->flags & GIT_SUBMODULE_STATUS__WD_OID_VALID) == 0) {