proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-11 17:41:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clone: don't rely on auto-saving for single-branch

Browse Source 
The code used to rely on the clone code calling the remote's save, which
does not happen anymore, meaning that the configuration settings the
remote expected were not being written to disk.

The run-time configuration was still being affected, so the right branch
was being cloned. The tests continued to pass as we did not check for
the configuration entires. Fix this by creating the remote with the
single-branch refspec we want and checking for its existence in the
configuration.
This commit is contained in:
Carlos Martín Nieto 2015-05-14 09:33:54 +02:00
parent 9663d1bd8b
commit 7b5ce2e5c4
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/online/remotes.c
View File

@ -1,19 +1,12 @@
#include "clar_libgit2.h" #include "clar_libgit2.h"
static const char *refspec = "refs/heads/first-merge:refs/remotes/origin/first-merge";
static int remote_single_branch(git_remote **out, git_repository *repo, const char *name, const char *url, void *payload) static int remote_single_branch(git_remote **out, git_repository *repo, const char *name, const char *url, void *payload)
{ {
char *fetch_refspecs[] = {
"refs/heads/first-merge:refs/remotes/origin/first-merge",
};
git_strarray fetch_refspecs_strarray = {
fetch_refspecs,
1,
};
GIT_UNUSED(payload); GIT_UNUSED(payload);
cl_git_pass(git_remote_create(out, repo, name, url)); cl_git_pass(git_remote_create_with_fetchspec(out, repo, name, url, refspec));
cl_git_pass(git_remote_set_fetch_refspecs(*out, &fetch_refspecs_strarray));
return 0; return 0;
} }
@ -22,6 +15,7 @@ void test_online_remotes__single_branch(void)
{ {
git_clone_options opts = GIT_CLONE_OPTIONS_INIT; git_clone_options opts = GIT_CLONE_OPTIONS_INIT;
git_repository *repo; git_repository *repo;
git_remote *remote;
git_strarray refs; git_strarray refs;
size_t i, count = 0; size_t i, count = 0;
@ -38,6 +32,15 @@ void test_online_remotes__single_branch(void)
cl_assert_equal_i(1, count); cl_assert_equal_i(1, count);
git_strarray_free(&refs); git_strarray_free(&refs);
cl_git_pass(git_remote_lookup(&remote, repo, "origin"));
cl_git_pass(git_remote_get_fetch_refspecs(&refs, remote));
cl_assert_equal_i(1, refs.count);
cl_assert_equal_s(refspec, refs.strings[0]);
git_strarray_free(&refs);
git_remote_free(remote);
git_repository_free(repo); git_repository_free(repo);
} }