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

Merge pull request #2184 from libgit2/rb/fix-revwalk-order-regression

Browse Source 
Fix pqueue sort boundary condition bug
This commit is contained in:
Edward Thomson 2014-03-12 12:05:35 -07:00
commit e59e712f64
3 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pqueue.c
View File

@ -68,7 +68,7 @@ static void pqueue_down(git_pqueue *pq, size_t el)
kid_el += 1;
}
if (pq->_cmp(parent, kid) < 0)
if (pq->_cmp(parent, kid) <= 0)
break;
pq->contents[el] = kid;

31
tests/core/pqueue.c
View File

@ -95,3 +95,34 @@ void test_core_pqueue__max_heap_size(void)
git_pqueue_free(&pq);
}
static int cmp_ints_like_commit_time(const void *a, const void *b)
{
return *((const int *)a) < *((const int *)b);
}
void test_core_pqueue__interleaved_pushes_and_pops(void)
{
git_pqueue pq;
int i, j, *val;
static int commands[] =
{ 6, 9, 8, 0, 5, 0, 7, 0, 4, 3, 0, 0, 0, 4, 0, 2, 0, 1, 0, 0, -1 };
static int expected[] =
{ 9, 8, 7, 6, 5, 4, 4, 3, 2, 1, -1 };
cl_git_pass(git_pqueue_init(&pq, 0, 10, cmp_ints_like_commit_time));
for (i = 0, j = 0; commands[i] >= 0; ++i) {
if (!commands[i]) {
cl_assert((val = git_pqueue_pop(&pq)) != NULL);
cl_assert_equal_i(expected[j], *val);
++j;
} else {
cl_git_pass(git_pqueue_insert(&pq, &commands[i]));
}
}
cl_assert_equal_i(0, git_pqueue_size(&pq));
git_pqueue_free(&pq);
}

59
tests/revwalk/basic.c
View File

@ -290,3 +290,62 @@ void test_revwalk_basic__push_all(void)
/* git rev-list --count --all #=> 15 */
cl_assert_equal_i(15, i);
}
/*
* $ git rev-list br2 master e908
* a65fedf39aefe402d3bb6e24df4d4f5fe4547750
* e90810b8df3e80c413d903f631643c716887138d
* 6dcf9bf7541ee10456529833502442f385010c3d
* a4a7dce85cf63874e984719f4fdd239f5145052f
* be3563ae3f795b2b4353bcce3a527ad0a4f7f644
* c47800c7266a2be04c571c04d5a6614691ea99bd
* 9fd738e8f7967c078dceed8190330fc8648ee56a
* 4a202b346bb0fb0db7eff3cffeb3c70babbd2045
* 5b5b025afb0b4c913b4c338a42934a3863bf3644
* 8496071c1b46c854b31185ea97743be6a8774479
*/
void test_revwalk_basic__mimic_git_rev_list(void)
{
git_oid oid;
revwalk_basic_setup_walk(NULL);
git_revwalk_sorting(_walk, GIT_SORT_TIME);
cl_git_pass(git_revwalk_push_ref(_walk, "refs/heads/br2"));
cl_git_pass(git_revwalk_push_ref(_walk, "refs/heads/master"));
cl_git_pass(git_oid_fromstr(&oid, "e90810b8df3e80c413d903f631643c716887138d"));
cl_git_pass(git_revwalk_push(_walk, &oid));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "e90810b8df3e80c413d903f631643c716887138d"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "6dcf9bf7541ee10456529833502442f385010c3d"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "a4a7dce85cf63874e984719f4fdd239f5145052f"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "c47800c7266a2be04c571c04d5a6614691ea99bd"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "9fd738e8f7967c078dceed8190330fc8648ee56a"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "4a202b346bb0fb0db7eff3cffeb3c70babbd2045"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "5b5b025afb0b4c913b4c338a42934a3863bf3644"));
cl_git_pass(git_revwalk_next(&oid, _walk));
cl_assert(!git_oid_streq(&oid, "8496071c1b46c854b31185ea97743be6a8774479"));
cl_git_fail_with(git_revwalk_next(&oid, _walk), GIT_ITEROVER);
}