Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/libgit2.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Martí <vicent@github.com>2013-01-06 03:44:19 +0400
committerVicent Martí <vicent@github.com>2013-01-06 03:44:19 +0400
commitd74b1bc5292a438d68d802082825cbf3a6661074 (patch)
treec44bbf00590f6faf885ddf8ca340b369092dab98 /tests-clar/revwalk
parent2b7b3e1fae889d2bd4a7c8fe538aa636b1eb7ba5 (diff)
parent7d26c410bf6f5ba3be18c60d789d064219f9aca6 (diff)
Merge pull request #1131 from libgit2/correct-ahead-behind
Fix an issue with ahead-behind for lopsided traversal
Diffstat (limited to 'tests-clar/revwalk')
-rw-r--r--tests-clar/revwalk/mergebase.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests-clar/revwalk/mergebase.c b/tests-clar/revwalk/mergebase.c
index 4faf6156f..293a585f0 100644
--- a/tests-clar/revwalk/mergebase.c
+++ b/tests-clar/revwalk/mergebase.c
@@ -118,10 +118,9 @@ void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void)
cl_assert_equal_i(GIT_ENOTFOUND, error);
- cl_git_fail(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two));
- cl_git_fail(error);
-
- cl_assert_equal_i(GIT_ENOTFOUND, error);
+ cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two));
+ cl_assert_equal_i(2, ahead);
+ cl_assert_equal_i(4, behind);
}
void test_revwalk_mergebase__no_off_by_one_missing(void)