diff options
| author | yorah <yoram.harmelin@gmail.com> | 2013-05-30 18:06:54 +0200 |
|---|---|---|
| committer | yorah <yoram.harmelin@gmail.com> | 2013-05-30 18:06:54 +0200 |
| commit | df50512aebb77f9fab3a930e367fba3777d6ee81 (patch) | |
| tree | 325da1a222fa96f59a6e7448505f404bd1571e78 | |
| parent | 215af2ccb87ac22d94b7205ff97a050622de6897 (diff) | |
| download | libgit2-df50512aebb77f9fab3a930e367fba3777d6ee81.tar.gz | |
Proposal to handle default value (auto = 0)
| -rw-r--r-- | include/git2/remote.h | 7 | ||||
| -rw-r--r-- | src/clone.c | 1 | ||||
| -rw-r--r-- | src/remote.c | 7 |
3 files changed, 4 insertions, 11 deletions
diff --git a/include/git2/remote.h b/include/git2/remote.h index 2aa384a54..3f43916b5 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -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); typedef enum { - GIT_REMOTE_DOWNLOAD_TAGS_UNSET, - GIT_REMOTE_DOWNLOAD_TAGS_NONE, - GIT_REMOTE_DOWNLOAD_TAGS_AUTO, - GIT_REMOTE_DOWNLOAD_TAGS_ALL + GIT_REMOTE_DOWNLOAD_TAGS_AUTO = 0, + GIT_REMOTE_DOWNLOAD_TAGS_NONE = 1, + GIT_REMOTE_DOWNLOAD_TAGS_ALL = 2 } git_remote_autotag_option_t; /** diff --git a/src/clone.c b/src/clone.c index 7ebdb5765..4f763268b 100644 --- a/src/clone.c +++ b/src/clone.c @@ -422,7 +422,6 @@ static void normalize_options(git_clone_options *dst, const git_clone_options *s /* Provide defaults for null pointers */ if (!dst->remote_name) dst->remote_name = "origin"; - if (!dst->remote_autotag) dst->remote_autotag = GIT_REMOTE_DOWNLOAD_TAGS_AUTO; } int git_clone( diff --git a/src/remote.c b/src/remote.c index 4fefe8001..4c1b39818 100644 --- a/src/remote.c +++ b/src/remote.c @@ -48,8 +48,7 @@ static int download_tags_value(git_remote *remote, git_config *cfg) git_buf buf = GIT_BUF_INIT; int error; - /* This is the default, let's see if we need to change it */ - remote->download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO; + /* The 0 value is the default (auto), let's see if we need to change it */ if (git_buf_printf(&buf, "remote.%s.tagopt", remote->name) < 0) return -1; @@ -117,9 +116,6 @@ static int create_internal(git_remote **out, git_repository *repo, const char *n if (!name) /* A remote without a name doesn't download tags */ 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; git_buf_free(&fetchbuf); @@ -245,7 +241,6 @@ int git_remote_load(git_remote **out, git_repository *repo, const char *name) git_config *config; struct refspec_cb_data data; - assert(out && repo && name); if ((error = ensure_remote_name_is_valid(name)) < 0) |