diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2014-04-02 18:14:02 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-04-02 20:22:22 +0200 |
commit | 6f6be8fe4199b5bccad00a9a3ab8b078286c1837 (patch) | |
tree | b370c775748144099178f9fcaaf8521ecc616ad4 /tests/fetchhead | |
parent | 64a862c2b88e2c92157e9b5f257fa433612bd828 (diff) | |
download | libgit2-6f6be8fe4199b5bccad00a9a3ab8b078286c1837.tar.gz |
remote: write tests for cloning from an empty repo
Cloning from an empty repo must set master's upstream to origin's
master, even if neither of them exist.
Fetching from a non-empty origin must then mark the master branch
for-merge. This currently fails.
Diffstat (limited to 'tests/fetchhead')
-rw-r--r-- | tests/fetchhead/fetchhead_data.h | 1 | ||||
-rw-r--r-- | tests/fetchhead/nonetwork.c | 36 |
2 files changed, 36 insertions, 1 deletions
diff --git a/tests/fetchhead/fetchhead_data.h b/tests/fetchhead/fetchhead_data.h index 294c9fb01..34adb3d08 100644 --- a/tests/fetchhead/fetchhead_data.h +++ b/tests/fetchhead/fetchhead_data.h @@ -28,4 +28,3 @@ #define FETCH_HEAD_EXPLICIT_DATA \ "0966a434eb1a025db6b71485ab63a3bfbea520b6\t\tbranch 'first-merge' of git://github.com/libgit2/TestGitRepository\n" - diff --git a/tests/fetchhead/nonetwork.c b/tests/fetchhead/nonetwork.c index a68ebb0b7..d8c70e8b2 100644 --- a/tests/fetchhead/nonetwork.c +++ b/tests/fetchhead/nonetwork.c @@ -307,3 +307,39 @@ void test_fetchhead_nonetwork__invalid_description(void) cl_assert(git__prefixcmp(giterr_last()->message, "Invalid description") == 0); } +static int assert_master_for_merge(const char *ref, const char *url, const git_oid *id, unsigned int is_merge, void *data) +{ + GIT_UNUSED(url); + GIT_UNUSED(id); + GIT_UNUSED(data); + + if (!strcmp("refs/heads/master", ref) && !is_merge) + return -1; + + return 0; +} + +void test_fetchhead_nonetwork__unborn_with_upstream(void) +{ + git_repository *repo; + git_remote *remote; + + /* Create an empty repo to clone from */ + cl_set_cleanup(&cleanup_repository, "./test1"); + cl_git_pass(git_repository_init(&g_repo, "./test1", 0)); + cl_set_cleanup(&cleanup_repository, "./repowithunborn"); + cl_git_pass(git_clone(&repo, "./test1", "./repowithunborn", NULL)); + + /* Simulate someone pushing to it by changing to one that has stuff */ + cl_git_pass(git_remote_load(&remote, repo, "origin")); + cl_git_pass(git_remote_set_url(remote, cl_fixture("testrepo.git"))); + cl_git_pass(git_remote_save(remote)); + + cl_git_pass(git_remote_fetch(remote, NULL, NULL)); + git_remote_free(remote); + + cl_git_pass(git_repository_fetchhead_foreach(repo, assert_master_for_merge, NULL)); + + git_repository_free(repo); + cl_fixture_cleanup("./repowithunborn"); +} |