proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-07-27 05:46:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename conflict to collision to prevent confusion

Browse Source
This commit is contained in:
Russell Belfer 2014-01-30 11:38:25 -08:00
parent 71ae760116
commit b794cbcdb6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/index.c
View File

@ -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