Idea-Studios/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-06-22 06:26:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zero_oid_in_old'

Browse Source 
Manually merging #5842
This commit is contained in:
Edward Thomson
2021-05-16 11:11:56 +01:00
parent be95f684da cf323cb9d9
commit 589443883b
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/git2/refs.h
View File

@@ -97,6 +97,9 @@ GIT_EXTERN(int) git_reference_dwim(git_reference **out, git_repository *repo, co
* of updating does not match the one passed through `current_value`
* (i.e. if the ref has changed since the user read it).
*
* If `current_value` is all zeros, this function will return GIT_EMODIFIED
* if the ref already exists.
*
* @param out Pointer to the newly created reference
* @param repo Repository where that reference will live
* @param name The name of the reference

5
src/refdb_fs.c
View File

@@ -1173,8 +1173,11 @@ static int cmp_old_ref(int *cmp, git_refdb_backend *backend, const char *name,
if (!old_id && !old_target)
return 0;
if ((error = refdb_fs_backend__lookup(&old_ref, backend, name)) < 0)
if ((error = refdb_fs_backend__lookup(&old_ref, backend, name)) < 0) {
if (error == GIT_ENOTFOUND && old_id && git_oid_is_zero(old_id))
return 0;
goto out;
}
/* If the types don't match, there's no way the values do */
if (old_id && old_ref->type != GIT_REFERENCE_DIRECT) {

16
tests/refs/races.c
View File

@@ -22,6 +22,22 @@ void test_refs_races__cleanup(void)
cl_git_sandbox_cleanup();
}
void test_refs_races__create_matching_zero_old(void)
{
git_reference *ref;
git_oid id, zero_id;
git_oid_fromstr(&id, commit_id);
git_oid_fromstr(&zero_id, "0000000000000000000000000000000000000000");
cl_git_fail(git_reference_create_matching(&ref, g_repo, refname, &id, 1, &zero_id, NULL));
cl_git_pass(git_reference_create_matching(&ref, g_repo, other_refname, &id, 1, &zero_id, NULL));
cl_git_fail(git_reference_create_matching(&ref, g_repo, other_refname, &id, 1, &zero_id, NULL));
git_reference_free(ref);
}
void test_refs_races__create_matching(void)
{
git_reference *ref, *ref2, *ref3;