diff options
| author | Ben Straub <bs@github.com> | 2013-02-06 13:16:13 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-02-06 13:16:13 -0800 |
| commit | 169fa384fea910f299f80498435e880fbcba244f (patch) | |
| tree | 60a06464b96ce5799009f79e6c88cac90db62ee0 | |
| parent | f393d4e8d725b3e45a4b438a6f3ab7be589b2806 (diff) | |
| download | libgit2-169fa384fea910f299f80498435e880fbcba244f.tar.gz | |
Fix fetchhead tests to expect nearly-dangling
| -rw-r--r-- | tests-clar/fetchhead/fetchhead_data.h | 6 | ||||
| -rw-r--r-- | tests-clar/online/fetchhead.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests-clar/fetchhead/fetchhead_data.h b/tests-clar/fetchhead/fetchhead_data.h index 71f67be25..0740d69d7 100644 --- a/tests-clar/fetchhead/fetchhead_data.h +++ b/tests-clar/fetchhead/fetchhead_data.h @@ -5,7 +5,8 @@ "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1\tnot-for-merge\tbranch 'no-parent' of git://github.com/libgit2/TestGitRepository\n" \ "d96c4e80345534eccee5ac7b07fc7603b56124cb\tnot-for-merge\ttag 'annotated_tag' of git://github.com/libgit2/TestGitRepository\n" \ "55a1a760df4b86a02094a904dfa511deb5655905\tnot-for-merge\ttag 'blob' of git://github.com/libgit2/TestGitRepository\n" \ - "8f50ba15d49353813cc6e20298002c0d17b0a9ee\tnot-for-merge\ttag 'commit_tree' of git://github.com/libgit2/TestGitRepository\n" + "8f50ba15d49353813cc6e20298002c0d17b0a9ee\tnot-for-merge\ttag 'commit_tree' of git://github.com/libgit2/TestGitRepository\n" \ + "6e0c7bdb9b4ed93212491ee778ca1c65047cab4e\tnot-for-merge\ttag 'nearly-dangling' of git://github.com/libgit2/TestGitRepository\n" #define FETCH_HEAD_NO_MERGE_DATA \ "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ @@ -13,7 +14,8 @@ "42e4e7c5e507e113ebbb7801b16b52cf867b7ce1\tnot-for-merge\tbranch 'no-parent' of git://github.com/libgit2/TestGitRepository\n" \ "d96c4e80345534eccee5ac7b07fc7603b56124cb\tnot-for-merge\ttag 'annotated_tag' of git://github.com/libgit2/TestGitRepository\n" \ "55a1a760df4b86a02094a904dfa511deb5655905\tnot-for-merge\ttag 'blob' of git://github.com/libgit2/TestGitRepository\n" \ - "8f50ba15d49353813cc6e20298002c0d17b0a9ee\tnot-for-merge\ttag 'commit_tree' of git://github.com/libgit2/TestGitRepository\n" + "8f50ba15d49353813cc6e20298002c0d17b0a9ee\tnot-for-merge\ttag 'commit_tree' of git://github.com/libgit2/TestGitRepository\n" \ + "6e0c7bdb9b4ed93212491ee778ca1c65047cab4e\tnot-for-merge\ttag 'nearly-dangling' of git://github.com/libgit2/TestGitRepository\n" #define FETCH_HEAD_EXPLICIT_DATA \ diff --git a/tests-clar/online/fetchhead.c b/tests-clar/online/fetchhead.c index f89270741..84a2177ea 100644 --- a/tests-clar/online/fetchhead.c +++ b/tests-clar/online/fetchhead.c @@ -81,7 +81,7 @@ void test_online_fetchhead__no_merges(void) cl_git_pass(git_repository_config(&config, g_repo)); cl_git_pass(git_config_set_string(config, "branch.master.remote", NULL)); cl_git_pass(git_config_set_string(config, "branch.master.merge", NULL)); - git_config_free(config); + git_config_free(config); fetchhead_test_fetch(NULL, FETCH_HEAD_NO_MERGE_DATA); } |