diff options
| author | Russell Belfer <rb@github.com> | 2014-01-30 11:38:25 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2014-01-30 11:38:25 -0800 |
| commit | b794cbcdb638676e593cc8d2ff3394ae21f2a185 (patch) | |
| tree | 2895ff28b513b6af53d6c164f3ed4ca163dea7db /src/index.c | |
| parent | 71ae7601160aca672f2b13a461aab6e4aee7f9d0 (diff) | |
| download | libgit2-b794cbcdb638676e593cc8d2ff3394ae21f2a185.tar.gz | |
Rename conflict to collision to prevent confusion
Diffstat (limited to 'src/index.c')
| -rw-r--r-- | src/index.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/index.c b/src/index.c index 01321d8a1..7bc5d5b24 100644 --- a/src/index.c +++ b/src/index.c @@ -804,7 +804,7 @@ static int has_dir_name(git_index *index, return retval; } -static int check_file_directory_conflict(git_index *index, +static int check_file_directory_collision(git_index *index, git_index_entry *entry, size_t pos, int ok_to_replace) { int retval = has_file_name(index, entry, pos, ok_to_replace); @@ -844,7 +844,7 @@ static int index_insert(git_index *index, git_index_entry *entry, int replace) entry->mode = index_merge_mode(index, *existing, entry->mode); } - if (check_file_directory_conflict(index, entry, position, replace) < 0) + if (check_file_directory_collision(index, entry, position, replace) < 0) return -1; /* if replacing is not requested or no existing entry exists, just |