diff options
| author | Patrick Steinhardt <ps@pks.im> | 2015-11-10 15:53:09 +0100 |
|---|---|---|
| committer | Patrick Steinhardt <ps@pks.im> | 2017-02-13 10:13:02 +0100 |
| commit | 8acc3b16efb3332596579b17b2046ecdeeac275a (patch) | |
| tree | 0cca1dbf6c9a075e7d8e13e2d50c5ddfdfedf57c /tests/iterator/workdir.c | |
| parent | e5a620de803ddcb0c05e43c6a8d7d6d4baeb808c (diff) | |
| download | libgit2-8acc3b16efb3332596579b17b2046ecdeeac275a.tar.gz | |
tests: add merge-conflict branch for testrepo
Add a new branch that causes a merge conflict to `testrepo` so
that we are able to test merging in worktrees.
Diffstat (limited to 'tests/iterator/workdir.c')
| -rw-r--r-- | tests/iterator/workdir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/iterator/workdir.c b/tests/iterator/workdir.c index 165cca5ed..f33fd98f1 100644 --- a/tests/iterator/workdir.c +++ b/tests/iterator/workdir.c @@ -613,6 +613,7 @@ void test_iterator_workdir__filesystem2(void) "heads/ident", "heads/long-file-name", "heads/master", + "heads/merge-conflict", "heads/packed-test", "heads/subtrees", "heads/test", @@ -629,7 +630,7 @@ void test_iterator_workdir__filesystem2(void) cl_git_pass(git_iterator_for_filesystem( &i, "testrepo/.git/refs", NULL)); - expect_iterator_items(i, 14, expect_base, 14, expect_base); + expect_iterator_items(i, 15, expect_base, 15, expect_base); git_iterator_free(i); } |