proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-11 04:28:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

index: make relative comparison use the checksum as well

Browse Source 
This is used by the submodule in order to figure out if the index has
changed since it last read it. Using a timestamp is racy, so let's make
it use the checksum, just like we now do for reloading the index itself.
This commit is contained in:
Carlos Martín Nieto 2015-06-20 16:17:28 +02:00
parent 5e947c91d4
commit 624c949f01
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/index.c
View File

@ -679,15 +679,13 @@ int git_index_read(git_index *index, int force)
}
int git_index__changed_relative_to(
git_index *index, const git_futils_filestamp *fs)
git_index *index, const git_oid *checksum)
{
/* attempt to update index (ignoring errors) */
if (git_index_read(index, false) < 0)
giterr_clear();
return (index->stamp.mtime != fs->mtime ||
index->stamp.size != fs->size ||
index->stamp.ino != fs->ino);
return !!git_oid_cmp(&index->checksum, checksum);
}
/*

2
src/index.h
View File

@ -81,7 +81,7 @@ GIT_INLINE(const git_futils_filestamp *) git_index__filestamp(git_index *index)
return &index->stamp;
}
extern int git_index__changed_relative_to(git_index *index, const git_futils_filestamp *fs);
extern int git_index__changed_relative_to(git_index *index, const git_oid *checksum);
/* Copy the current entries vector *and* increment the index refcount.
* Call `git_index__release_snapshot` when done.

5
src/submodule.c
View File

@ -1946,7 +1946,7 @@ static int submodule_cache_refresh(git_submodule_cache *cache, int refresh)
update_index = update_head = update_gitmod = true;
else {
update_index =
!idx || git_index__changed_relative_to(idx, &cache->index_stamp);
!idx || git_index__changed_relative_to(idx, &cache->index_checksum);
update_head =
!head || !git_oid_equal(&cache->head_id, git_tree_id(head));
@ -1984,8 +1984,7 @@ static int submodule_cache_refresh(git_submodule_cache *cache, int refresh)
if ((error = submodule_cache_refresh_from_index(cache, idx)) < 0)
goto cleanup;
git_futils_filestamp_set(
&cache->index_stamp, git_index__filestamp(idx));
git_oid_cpy(&cache->index_checksum, git_index_checksum(idx));
}
/* add submodule information from HEAD */

2
src/submodule.h
View File

@ -110,7 +110,7 @@ typedef struct {
/* cache invalidation data */
git_oid head_id;
git_futils_filestamp index_stamp;
git_oid index_checksum;
git_buf gitmodules_path;
git_futils_filestamp gitmodules_stamp;
git_futils_filestamp config_stamp;