Skip to content

G
git2
Commit f2915ec4 by Edward Thomson
Options

tests: reformat upstream merge

parent 55f2abb8
Showing with 5 additions and 5 deletions
tests/refs/branches/upstream.c
...@@ -75,8 +75,8 @@ void test_refs_branches_upstream__upstream_merge(void) ...@@ -75,8 +75,8 @@ void test_refs_branches_upstream__upstream_merge(void)
{ {
git_reference *branch; git_reference *branch;
git_repository *repository; git_repository *repository;
git_buf buf = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT;
repository = cl_git_sandbox_init("testrepo.git"); repository = cl_git_sandbox_init("testrepo.git");
/* check repository */ /* check repository */
...@@ -89,9 +89,9 @@ void test_refs_branches_upstream__upstream_merge(void) ...@@ -89,9 +89,9 @@ void test_refs_branches_upstream__upstream_merge(void)
git_reference_free(branch); git_reference_free(branch);
/* check merge branch */ /* check merge branch */
cl_git_pass(git_branch_upstream_merge(&buf, repository, "refs/heads/test")); cl_git_pass(git_branch_upstream_merge(&buf, repository, "refs/heads/test"));
cl_assert_equal_s("refs/heads/master", buf.ptr); cl_assert_equal_s("refs/heads/master", buf.ptr);
git_buf_dispose(&buf); git_buf_dispose(&buf);
} }
void test_refs_branches_upstream__upstream_remote_empty_value(void) void test_refs_branches_upstream__upstream_remote_empty_value(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment