diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-24 18:09:13 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-24 18:09:13 +0100 |
| commit | 85a41fc4bf148dc954fa8124b61355ee648c40ba (patch) | |
| tree | 477ab7f38edf350dff922e9b21612f4d71ae3c76 /src/index.c | |
| parent | f57cc63811db2717e9ba42e720a75f71557f9451 (diff) | |
| parent | 58c2b1c4218a2f90ee2745687f2e17670bde0b1b (diff) | |
| download | libgit2-85a41fc4bf148dc954fa8124b61355ee648c40ba.tar.gz | |
Merge pull request #2183 from ethomson/merge_refactor
Refactor the `git_merge` API
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; |