summaryrefslogtreecommitdiff
path: root/tests/revwalk/basic.c
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-02-01 15:19:13 +0100
committerCarlos Martín Nieto <cmn@dwim.me>2014-02-05 12:16:44 +0100
commitd465e4e980333b3e7437801fc375b595fb3adf1f (patch)
tree2303ab03d8c8162a2305b337786d24fea73a2e12 /tests/revwalk/basic.c
parentb4ef67d5ebc55943073d7baacd91f46c20d9ccf4 (diff)
downloadlibgit2-d465e4e980333b3e7437801fc375b595fb3adf1f.tar.gz
revwalk: ignore wrong object type in glob pushes
Pushing a whole namespace can cause us to attempt to push non-committish objects. Catch this situation and special-case it for ignoring this.
Diffstat (limited to 'tests/revwalk/basic.c')
-rw-r--r--tests/revwalk/basic.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/revwalk/basic.c b/tests/revwalk/basic.c
index 4621ab8ff..4d6522c1c 100644
--- a/tests/revwalk/basic.c
+++ b/tests/revwalk/basic.c
@@ -255,10 +255,19 @@ void test_revwalk_basic__push_range(void)
void test_revwalk_basic__push_mixed(void)
{
+ git_oid oid;
+ int i = 0;
+
revwalk_basic_setup_walk(NULL);
git_revwalk_reset(_walk);
git_revwalk_sorting(_walk, 0);
cl_git_pass(git_revwalk_push_glob(_walk, "tags"));
- cl_git_pass(test_walk_only(_walk, commit_sorting_segment, 1));
+
+ while (git_revwalk_next(&oid, _walk) == 0) {
+ i++;
+ }
+
+ /* git rev-list --count --glob=tags #=> 9 */
+ cl_assert_equal_i(9, i);
}