diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-03-10 22:30:41 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:05 -0700 |
| commit | 05d47768caf6fec51fa85cb6275c9ba8324aead6 (patch) | |
| tree | bb98a984f248f5139bfdbc9cf41e7174b1139ace /src/index.c | |
| parent | f29e48995e1af91127157a1eca4177c2f411b1bb (diff) | |
| download | libgit2-05d47768caf6fec51fa85cb6275c9ba8324aead6.tar.gz | |
Introduce git_merge_file for consumers
Diffstat (limited to 'src/index.c')
| -rw-r--r-- | src/index.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/index.c b/src/index.c index 0d7d50668..ea0815e4c 100644 --- a/src/index.c +++ b/src/index.c @@ -300,7 +300,7 @@ static void index_entry_free(git_index_entry *entry) git__free(entry); } -static unsigned int index_create_mode(unsigned int mode) +unsigned int git_index__create_mode(unsigned int mode) { if (S_ISLNK(mode)) return S_IFLNK; @@ -320,9 +320,9 @@ static unsigned int index_merge_mode( if (index->distrust_filemode && S_ISREG(mode)) return (existing && S_ISREG(existing->mode)) ? - existing->mode : index_create_mode(0666); + existing->mode : git_index__create_mode(0666); - return index_create_mode(mode); + return git_index__create_mode(mode); } void git_index__set_ignore_case(git_index *index, bool ignore_case) @@ -619,7 +619,7 @@ void git_index_entry__init_from_stat( entry->dev = st->st_rdev; entry->ino = st->st_ino; entry->mode = (!trust_mode && S_ISREG(st->st_mode)) ? - index_create_mode(0666) : index_create_mode(st->st_mode); + git_index__create_mode(0666) : git_index__create_mode(st->st_mode); entry->uid = st->st_uid; entry->gid = st->st_gid; entry->file_size = st->st_size; |