Commit df50512a by yorah

Proposal to handle default value (auto = 0)

parent 215af2cc
...@@ -426,10 +426,9 @@ GIT_EXTERN(int) git_remote_set_callbacks(git_remote *remote, git_remote_callback ...@@ -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;
/** /**
......
...@@ -422,7 +422,6 @@ static void normalize_options(git_clone_options *dst, const git_clone_options *s ...@@ -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(
......
...@@ -48,8 +48,7 @@ static int download_tags_value(git_remote *remote, git_config *cfg) ...@@ -48,8 +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;
/* This is the default, let's see if we need to change it */ /* The 0 value is the default (auto), 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,9 +116,6 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n ...@@ -117,9 +116,6 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n
if (!name) if (!name)
/* A remote without a name doesn't download tags */ /* 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;
else
/* the default for a newly created remote is auto */
remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO;
*out = remote; *out = remote;
git_buf_free(&fetchbuf); git_buf_free(&fetchbuf);
...@@ -245,7 +241,6 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name) ...@@ -245,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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment