From beede4321fef2580c8198d6c918fb2de1a0fae9c Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Wed, 6 Feb 2013 13:25:43 -0800 Subject: [PATCH] Fetchhead: don't expect a tag that isn't there --- tests-clar/fetchhead/fetchhead_data.h | 8 ++++++++ tests-clar/fetchhead/nonetwork.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests-clar/fetchhead/fetchhead_data.h b/tests-clar/fetchhead/fetchhead_data.h index 0740d69d7..294c9fb01 100644 --- a/tests-clar/fetchhead/fetchhead_data.h +++ b/tests-clar/fetchhead/fetchhead_data.h @@ -1,4 +1,12 @@ +#define FETCH_HEAD_WILDCARD_DATA_LOCAL \ + "49322bb17d3acc9146f98c97d078513228bbf3c0\t\tbranch 'master' of git://github.com/libgit2/TestGitRepository\n" \ + "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ + "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" + #define FETCH_HEAD_WILDCARD_DATA \ "49322bb17d3acc9146f98c97d078513228bbf3c0\t\tbranch 'master' of git://github.com/libgit2/TestGitRepository\n" \ "0966a434eb1a025db6b71485ab63a3bfbea520b6\tnot-for-merge\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" \ diff --git a/tests-clar/fetchhead/nonetwork.c b/tests-clar/fetchhead/nonetwork.c index b8cb69e68..ef30679f9 100644 --- a/tests-clar/fetchhead/nonetwork.c +++ b/tests-clar/fetchhead/nonetwork.c @@ -92,7 +92,7 @@ void test_fetchhead_nonetwork__write(void) cl_git_pass(git_futils_readbuffer(&fetchhead_buf, "./test1/.git/FETCH_HEAD")); - equals = (strcmp(fetchhead_buf.ptr, FETCH_HEAD_WILDCARD_DATA) == 0); + equals = (strcmp(fetchhead_buf.ptr, FETCH_HEAD_WILDCARD_DATA_LOCAL) == 0); git_buf_free(&fetchhead_buf);