proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-23 12:05:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

index: Adjust namemask & mode when filling

Browse Source
This commit is contained in:
Vicent Marti 2015-12-16 16:53:06 +01:00
parent f824259e67
commit 0cc20a8c48
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/index.c
View File

@ -879,6 +879,18 @@ void git_index_entry__init_from_stat(
entry->file_size = st->st_size; entry->file_size = st->st_size;
} }
static void index_entry_adjust_namemask(
git_index_entry *entry,
size_t path_length)
{
entry->flags &= ~GIT_IDXENTRY_NAMEMASK;
if (path_length < GIT_IDXENTRY_NAMEMASK)
entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK;
else
entry->flags |= GIT_IDXENTRY_NAMEMASK;
}
static int index_entry_create( static int index_entry_create(
git_index_entry **out, git_index_entry **out,
git_repository *repo, git_repository *repo,
@ -1279,13 +1291,7 @@ static int index_insert(
/* make sure that the path length flag is correct */ /* make sure that the path length flag is correct */
path_length = ((struct entry_internal *)entry)->pathlen; path_length = ((struct entry_internal *)entry)->pathlen;
index_entry_adjust_namemask(entry, path_length);
entry->flags &= ~GIT_IDXENTRY_NAMEMASK;
if (path_length < GIT_IDXENTRY_NAMEMASK)
entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK;
else
entry->flags |= GIT_IDXENTRY_NAMEMASK;
/* this entry is now up-to-date and should not be checked for raciness */ /* this entry is now up-to-date and should not be checked for raciness */
entry->flags_extended |= GIT_IDXENTRY_UPTODATE; entry->flags_extended |= GIT_IDXENTRY_UPTODATE;
@ -1561,10 +1567,11 @@ int git_index__fill(git_index *index, const git_vector *source_entries)
if ((ret = index_entry_dup(&entry, index, source_entry)) < 0) if ((ret = index_entry_dup(&entry, index, source_entry)) < 0)
break; break;
index_entry_adjust_namemask(entry, ((struct entry_internal *)entry)->pathlen);
entry->flags_extended |= GIT_IDXENTRY_UPTODATE; entry->flags_extended |= GIT_IDXENTRY_UPTODATE;
entry->mode = git_index__create_mode(entry->mode);
ret = git_vector_insert(&index->entries, entry); if ((ret = git_vector_insert(&index->entries, entry)) < 0)
if (ret < 0)
break; break;
INSERT_IN_MAP(index, entry, ret); INSERT_IN_MAP(index, entry, ret);
@ -2889,11 +2896,7 @@ static int read_tree_cb(
entry->flags_extended = 0; entry->flags_extended = 0;
} }
if (path.size < GIT_IDXENTRY_NAMEMASK) index_entry_adjust_namemask(entry, path.size);
entry->flags = path.size & GIT_IDXENTRY_NAMEMASK;
else
entry->flags = GIT_IDXENTRY_NAMEMASK;
git_buf_free(&path); git_buf_free(&path);
if (git_vector_insert(data->new_entries, entry) < 0) { if (git_vector_insert(data->new_entries, entry) < 0) {