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

Merge pull request #958 from schu/fix-merge-base

Browse Source 
revwalk: fix off-by-one error
This commit is contained in:
Vicent Martí 2012-09-28 11:48:43 -07:00
commit 3f849902e4
6 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/revwalk.c
View File

@ -274,7 +274,8 @@ static int commit_parse(git_revwalk *walk, commit_object *commit)
static int interesting(git_pqueue *list)
{
unsigned int i;
for (i = 1; i < git_pqueue_size(list); i++) {
/* element 0 isn't used - we need to start at 1 */
for (i = 1; i < list->size; i++) {
commit_object *commit = list->d[i];
if ((commit->flags & STALE) == 0)
return 1;

2
tests-clar/odb/foreach.c
View File

@ -42,7 +42,7 @@ void test_odb_foreach__foreach(void)
git_repository_odb(&_odb, _repo);
cl_git_pass(git_odb_foreach(_odb, foreach_cb, NULL));
cl_assert_equal_i(43 + 1640, nobj); /* count + in-pack */
cl_assert_equal_i(46 + 1640, nobj); /* count + in-pack */
}
void test_odb_foreach__one_pack(void)

BIN
tests-clar/resources/testrepo.git/objects/1a/443023183e3f2bfbef8ac923cd81c1018a18fd Normal file
View File

Binary file not shown.

2
tests-clar/resources/testrepo.git/objects/9f/13f7d0a9402c681f91dc590cf7b5470e6a77d2 Normal file
View File

@ -0,0 +1,2 @@
x<01>ŽM
Â0F]ç³d2<64>¤ñ®<A~&´`­ÄôþV<C3BE>àæãmïËë²ÌÈÒ¡7Uà$äJöL9yM!¢GuœªH¤&UÈæ›>;ÔÂÁ…¬£³X†ÂEÈŽ5R±£ ÛAÑE &n}ZÜæ<E}À=O[ÒÖáüÞéú<C3A9>Ó¼^À,ã^†#¢É¿ƒ]ÿPÍ`>™A¹

BIN
tests-clar/resources/testrepo.git/objects/fd/4959ce7510db09d4d8217fa2d1780413e05a09 Normal file
View File

Binary file not shown.

9
tests-clar/revwalk/mergebase.c
View File

@ -67,6 +67,15 @@ void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void)
cl_assert_equal_i(GIT_ENOTFOUND, error);
}
void test_revwalk_mergebase__no_off_by_one_missing(void)
{
git_oid result, one, two;
cl_git_pass(git_oid_fromstr(&one, "1a443023183e3f2bfbef8ac923cd81c1018a18fd"));
cl_git_pass(git_oid_fromstr(&two, "9f13f7d0a9402c681f91dc590cf7b5470e6a77d2"));
cl_git_pass(git_merge_base(&result, _repo, &one, &two));
}
static void assert_mergebase_many(const char *expected_sha, int count, ...)
{
va_list ap;