summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2018-02-20 00:32:38 +0000
committerEdward Thomson <ethomson@edwardthomson.com>2018-02-23 16:54:39 -0800
commit18d9c8479f8534cc19765345560d2d39b8920a4d (patch)
tree411ec51fe2215bab8fabc3bad73a32d6bb64ab45
parent809b0ca6b9b6a5648b8e802a9f0c6a0821257595 (diff)
downloadlibgit2-18d9c8479f8534cc19765345560d2d39b8920a4d.tar.gz
testrepo: add new branch
Add a new branch to the `testrepo` repository, where the `README` file has changed to executable. This branch enables typechange tests between the new `executable` branch and `master`.
-rw-r--r--tests/iterator/workdir.c3
-rw-r--r--tests/refs/list.c4
-rw-r--r--tests/resources/testrepo/.gitted/objects/57/43a3ef145d3638a0fa28233ca92897117ad74fbin0 -> 160 bytes
-rw-r--r--tests/resources/testrepo/.gitted/objects/f9/ed4af42472941da45a3ce44458455ed227a6be2
-rw-r--r--tests/resources/testrepo/.gitted/refs/heads/executable1
-rw-r--r--tests/revwalk/basic.c2
6 files changed, 8 insertions, 4 deletions
diff --git a/tests/iterator/workdir.c b/tests/iterator/workdir.c
index 198edc7e8..81016752c 100644
--- a/tests/iterator/workdir.c
+++ b/tests/iterator/workdir.c
@@ -610,6 +610,7 @@ void test_iterator_workdir__filesystem2(void)
static const char *expect_base[] = {
"heads/br2",
"heads/dir",
+ "heads/executable",
"heads/ident",
"heads/long-file-name",
"heads/master",
@@ -630,7 +631,7 @@ void test_iterator_workdir__filesystem2(void)
cl_git_pass(git_iterator_for_filesystem(
&i, "testrepo/.git/refs", NULL));
- expect_iterator_items(i, 15, expect_base, 15, expect_base);
+ expect_iterator_items(i, 16, expect_base, 16, expect_base);
git_iterator_free(i);
}
diff --git a/tests/refs/list.c b/tests/refs/list.c
index f7ca3f707..97461fd69 100644
--- a/tests/refs/list.c
+++ b/tests/refs/list.c
@@ -36,7 +36,7 @@ void test_refs_list__all(void)
/* We have exactly 12 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, 17);
+ cl_assert_equal_i((int)ref_list.count, 18);
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, 17);
+ cl_assert_equal_i((int)ref_list.count, 18);
git_strarray_free(&ref_list);
}
diff --git a/tests/resources/testrepo/.gitted/objects/57/43a3ef145d3638a0fa28233ca92897117ad74f b/tests/resources/testrepo/.gitted/objects/57/43a3ef145d3638a0fa28233ca92897117ad74f
new file mode 100644
index 000000000..85abb27cc
--- /dev/null
+++ b/tests/resources/testrepo/.gitted/objects/57/43a3ef145d3638a0fa28233ca92897117ad74f
Binary files differ
diff --git a/tests/resources/testrepo/.gitted/objects/f9/ed4af42472941da45a3ce44458455ed227a6be b/tests/resources/testrepo/.gitted/objects/f9/ed4af42472941da45a3ce44458455ed227a6be
new file mode 100644
index 000000000..69c52fc9f
--- /dev/null
+++ b/tests/resources/testrepo/.gitted/objects/f9/ed4af42472941da45a3ce44458455ed227a6be
@@ -0,0 +1,2 @@
+xN[
+B!Uzꁈ~A8W 3K-?v|f&R.]61K-p% d&S6;5u3 9 ΄h|`Uh8gAk_jyQor#ZR;*1*j@ wgǵ|eO \ No newline at end of file
diff --git a/tests/resources/testrepo/.gitted/refs/heads/executable b/tests/resources/testrepo/.gitted/refs/heads/executable
new file mode 100644
index 000000000..2bdccea29
--- /dev/null
+++ b/tests/resources/testrepo/.gitted/refs/heads/executable
@@ -0,0 +1 @@
+f9ed4af42472941da45a3ce44458455ed227a6be
diff --git a/tests/revwalk/basic.c b/tests/revwalk/basic.c
index 547050c68..6a23701f3 100644
--- a/tests/revwalk/basic.c
+++ b/tests/revwalk/basic.c
@@ -177,7 +177,7 @@ void test_revwalk_basic__glob_heads_with_invalid(void)
/* walking */;
/* git log --branches --oneline | wc -l => 16 */
- cl_assert_equal_i(19, i);
+ cl_assert_equal_i(20, i);
}
void test_revwalk_basic__push_head(void)