summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@github.com>2016-06-15 17:22:40 -0500
committerEdward Thomson <ethomson@github.com>2016-06-25 18:05:44 -0400
commit45405a74fc7f6684ae83be4c16b76b84986c6113 (patch)
tree8dd29dccc4edfc0c25a47e65f5e10c94d6f9e6bd
parente1ca3886f5acf99135510f6727daa7495be99f7d (diff)
downloadlibgit2-45405a74fc7f6684ae83be4c16b76b84986c6113.tar.gz
testrepo: introduce `typechange` branch
Introduce a new branch that changes the file `README` into a folder.
-rw-r--r--tests/iterator/workdir.c3
-rw-r--r--tests/refs/list.c6
-rw-r--r--tests/resources/testrepo/.gitted/objects/67/59f8c30605b2928a4e07a5a8a850d5676286cbbin0 -> 165 bytes
-rw-r--r--tests/resources/testrepo/.gitted/objects/d9/dcc042e12d045925ca3f3764da4593bec5cb2fbin0 -> 158 bytes
-rw-r--r--tests/resources/testrepo/.gitted/objects/e6/ca4fc7b06ac7b0c0d74e8be9b8f786e17e7e0cbin0 -> 59 bytes
-rw-r--r--tests/resources/testrepo/.gitted/objects/ea/439563e635be3e1bb99c2f4c89a5f2823c9c84bin0 -> 28 bytes
-rw-r--r--tests/resources/testrepo/.gitted/refs/heads/typechange1
-rw-r--r--tests/revwalk/basic.c4
8 files changed, 8 insertions, 6 deletions
diff --git a/tests/iterator/workdir.c b/tests/iterator/workdir.c
index 28fcc0d23..f2ab04c7c 100644
--- a/tests/iterator/workdir.c
+++ b/tests/iterator/workdir.c
@@ -616,6 +616,7 @@ void test_iterator_workdir__filesystem2(void)
"heads/packed-test",
"heads/subtrees",
"heads/test",
+ "heads/typechange",
"tags/e90810b",
"tags/foo/bar",
"tags/foo/foo/bar",
@@ -628,7 +629,7 @@ void test_iterator_workdir__filesystem2(void)
cl_git_pass(git_iterator_for_filesystem(
&i, "testrepo/.git/refs", NULL));
- expect_iterator_items(i, 13, expect_base, 13, expect_base);
+ expect_iterator_items(i, 14, expect_base, 14, expect_base);
git_iterator_free(i);
}
diff --git a/tests/refs/list.c b/tests/refs/list.c
index 374943b05..f52e4587e 100644
--- a/tests/refs/list.c
+++ b/tests/refs/list.c
@@ -33,10 +33,10 @@ void test_refs_list__all(void)
printf("# %s\n", ref_list.strings[i]);
}*/
- /* We have exactly 12 refs in total if we include the packed ones:
+ /* We have exactly 16 refs in total if we include the packed ones:
* there is a reference that exists both in the packfile and as
* loose, but we only list it once */
- cl_assert_equal_i((int)ref_list.count, 15);
+ cl_assert_equal_i((int)ref_list.count, 16);
git_strarray_free(&ref_list);
}
@@ -51,7 +51,7 @@ void test_refs_list__do_not_retrieve_references_which_name_end_with_a_lock_exten
"144344043ba4d4a405da03de3844aa829ae8be0e\n");
cl_git_pass(git_reference_list(&ref_list, g_repo));
- cl_assert_equal_i((int)ref_list.count, 15);
+ cl_assert_equal_i((int)ref_list.count, 16);
git_strarray_free(&ref_list);
}
diff --git a/tests/resources/testrepo/.gitted/objects/67/59f8c30605b2928a4e07a5a8a850d5676286cb b/tests/resources/testrepo/.gitted/objects/67/59f8c30605b2928a4e07a5a8a850d5676286cb
new file mode 100644
index 000000000..5416421fa
--- /dev/null
+++ b/tests/resources/testrepo/.gitted/objects/67/59f8c30605b2928a4e07a5a8a850d5676286cb
Binary files differ
diff --git a/tests/resources/testrepo/.gitted/objects/d9/dcc042e12d045925ca3f3764da4593bec5cb2f b/tests/resources/testrepo/.gitted/objects/d9/dcc042e12d045925ca3f3764da4593bec5cb2f
new file mode 100644
index 000000000..4dce19f15
--- /dev/null
+++ b/tests/resources/testrepo/.gitted/objects/d9/dcc042e12d045925ca3f3764da4593bec5cb2f
Binary files differ
diff --git a/tests/resources/testrepo/.gitted/objects/e6/ca4fc7b06ac7b0c0d74e8be9b8f786e17e7e0c b/tests/resources/testrepo/.gitted/objects/e6/ca4fc7b06ac7b0c0d74e8be9b8f786e17e7e0c
new file mode 100644
index 000000000..635180b41
--- /dev/null
+++ b/tests/resources/testrepo/.gitted/objects/e6/ca4fc7b06ac7b0c0d74e8be9b8f786e17e7e0c
Binary files differ
diff --git a/tests/resources/testrepo/.gitted/objects/ea/439563e635be3e1bb99c2f4c89a5f2823c9c84 b/tests/resources/testrepo/.gitted/objects/ea/439563e635be3e1bb99c2f4c89a5f2823c9c84
new file mode 100644
index 000000000..9831bbd16
--- /dev/null
+++ b/tests/resources/testrepo/.gitted/objects/ea/439563e635be3e1bb99c2f4c89a5f2823c9c84
Binary files differ
diff --git a/tests/resources/testrepo/.gitted/refs/heads/typechange b/tests/resources/testrepo/.gitted/refs/heads/typechange
new file mode 100644
index 000000000..858380a74
--- /dev/null
+++ b/tests/resources/testrepo/.gitted/refs/heads/typechange
@@ -0,0 +1 @@
+6759f8c30605b2928a4e07a5a8a850d5676286cb
diff --git a/tests/revwalk/basic.c b/tests/revwalk/basic.c
index 5ed7da4eb..9a242eb04 100644
--- a/tests/revwalk/basic.c
+++ b/tests/revwalk/basic.c
@@ -176,8 +176,8 @@ void test_revwalk_basic__glob_heads_with_invalid(void)
for (i = 0; !git_revwalk_next(&oid, _walk); ++i)
/* walking */;
- /* git log --branches --oneline | wc -l => 16 */
- cl_assert_equal_i(18, i);
+ /* git log --branches --oneline | wc -l => 19 */
+ cl_assert_equal_i(19, i);
}
void test_revwalk_basic__push_head(void)