proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-06 21:53:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1623 from yorah/fix/tag_auto

Browse Source 
remote: make default tag retrieving behaviour consistent
This commit is contained in:
Vicent Martí 2013-05-31 03:08:48 -07:00
commit af2c72d228
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/git2/remote.h
View File

@ -426,10 +426,9 @@ GIT_EXTERN(int) git_remote_set_callbacks(git_remote *remote, git_remote_callback
GIT_EXTERN(const git_transfer_progress *) git_remote_stats(git_remote *remote); GIT_EXTERN(const git_transfer_progress *) git_remote_stats(git_remote *remote);
typedef enum { typedef enum {
GIT_REMOTE_DOWNLOAD_TAGS_UNSET, GIT_REMOTE_DOWNLOAD_TAGS_AUTO = 0,
GIT_REMOTE_DOWNLOAD_TAGS_NONE, GIT_REMOTE_DOWNLOAD_TAGS_NONE = 1,
GIT_REMOTE_DOWNLOAD_TAGS_AUTO, GIT_REMOTE_DOWNLOAD_TAGS_ALL = 2
GIT_REMOTE_DOWNLOAD_TAGS_ALL
} git_remote_autotag_option_t; } git_remote_autotag_option_t;
/** /**

1
src/clone.c
View File

@ -422,7 +422,6 @@ static void normalize_options(git_clone_options *dst, const git_clone_options *s
/* Provide defaults for null pointers */ /* Provide defaults for null pointers */
if (!dst->remote_name) dst->remote_name = "origin"; if (!dst->remote_name) dst->remote_name = "origin";
if (!dst->remote_autotag) dst->remote_autotag = GIT_REMOTE_DOWNLOAD_TAGS_AUTO;
} }
int git_clone( int git_clone(

12
src/remote.c
View File

@ -48,11 +48,7 @@ static int download_tags_value(git_remote *remote, git_config *cfg)
git_buf buf = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT;
int error; int error;
if (remote->download_tags != GIT_REMOTE_DOWNLOAD_TAGS_UNSET) /* The 0 value is the default (auto), let's see if we need to change it */
return 0;
/* This is the default, let's see if we need to change it */
remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO;
if (git_buf_printf(&buf, "remote.%s.tagopt", remote->name) < 0) if (git_buf_printf(&buf, "remote.%s.tagopt", remote->name) < 0)
return -1; return -1;
@ -117,10 +113,9 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n
goto on_error; goto on_error;
} }
/* A remote without a name doesn't download tags */ if (!name)
if (!name) { /* A remote without a name doesn't download tags */
remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_NONE; remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_NONE;
}
*out = remote; *out = remote;
git_buf_free(&fetchbuf); git_buf_free(&fetchbuf);
@ -246,7 +241,6 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name)
git_config *config; git_config *config;
struct refspec_cb_data data; struct refspec_cb_data data;
assert(out && repo && name); assert(out && repo && name);
if ((error = ensure_remote_name_is_valid(name)) < 0) if ((error = ensure_remote_name_is_valid(name)) < 0)

3
tests-clar/network/remote/remotes.c
View File

@ -286,11 +286,14 @@ void test_network_remote_remotes__add(void)
_remote = NULL; _remote = NULL;
cl_git_pass(git_remote_create(&_remote, _repo, "addtest", "http://github.com/libgit2/libgit2")); cl_git_pass(git_remote_create(&_remote, _repo, "addtest", "http://github.com/libgit2/libgit2"));
cl_assert_equal_i(GIT_REMOTE_DOWNLOAD_TAGS_AUTO, git_remote_autotag(_remote));
git_remote_free(_remote); git_remote_free(_remote);
_remote = NULL; _remote = NULL;
cl_git_pass(git_remote_load(&_remote, _repo, "addtest")); cl_git_pass(git_remote_load(&_remote, _repo, "addtest"));
cl_assert_equal_i(GIT_REMOTE_DOWNLOAD_TAGS_AUTO, git_remote_autotag(_remote));
_refspec = git_vector_get(&_remote->refspecs, 0); _refspec = git_vector_get(&_remote->refspecs, 0);
cl_assert_equal_s("refs/heads/*", git_refspec_src(_refspec)); cl_assert_equal_s("refs/heads/*", git_refspec_src(_refspec));
cl_assert(git_refspec_force(_refspec) == 1); cl_assert(git_refspec_force(_refspec) == 1);