diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-20 22:49:20 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-10-02 06:42:26 +0200 |
| commit | eec1c1fe1e9a12b57c4014be25ce4ed390c8e199 (patch) | |
| tree | 8d033d331a8d705eab805336d37192946c1cc6bc | |
| parent | b9bf5d701dd6dfcfcb41d2655f59f7669cd50ef9 (diff) | |
| download | libgit2-eec1c1fe1e9a12b57c4014be25ce4ed390c8e199.tar.gz | |
clone: const-ify checkout options
The removal of many options which lead to the direct usage of the
user's checkout options means we should make sure they remain const.
| -rw-r--r-- | include/git2/checkout.h | 2 | ||||
| -rw-r--r-- | include/git2/clone.h | 2 | ||||
| -rw-r--r-- | src/checkout.c | 6 | ||||
| -rw-r--r-- | src/checkout.h | 2 | ||||
| -rw-r--r-- | src/clone.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/include/git2/checkout.h b/include/git2/checkout.h index aa48069cd..844f0a9e2 100644 --- a/include/git2/checkout.h +++ b/include/git2/checkout.h @@ -255,7 +255,7 @@ typedef struct git_checkout_opts { */ GIT_EXTERN(int) git_checkout_head( git_repository *repo, - git_checkout_opts *opts); + const git_checkout_opts *opts); /** * Updates files in the working tree to match the content of the index. diff --git a/include/git2/clone.h b/include/git2/clone.h index cf759ab5c..a59de1bc7 100644 --- a/include/git2/clone.h +++ b/include/git2/clone.h @@ -104,7 +104,7 @@ GIT_EXTERN(int) git_clone( * default branch * @return 0 on success or an error code */ -GIT_EXTERN(int) git_clone_into(git_repository *repo, git_remote *remote, git_checkout_opts *co_opts, const char *branch); +GIT_EXTERN(int) git_clone_into(git_repository *repo, git_remote *remote, const git_checkout_opts *co_opts, const char *branch); /** @} */ GIT_END_DECL diff --git a/src/checkout.c b/src/checkout.c index 0e9d11bff..5d741d393 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1119,7 +1119,7 @@ static void checkout_data_clear(checkout_data *data) static int checkout_data_init( checkout_data *data, git_iterator *target, - git_checkout_opts *proposed) + const git_checkout_opts *proposed) { int error = 0; git_repository *repo = git_iterator_owner(target); @@ -1229,7 +1229,7 @@ cleanup: int git_checkout_iterator( git_iterator *target, - git_checkout_opts *opts) + const git_checkout_opts *opts) { int error = 0; git_iterator *baseline = NULL, *workdir = NULL; @@ -1404,7 +1404,7 @@ int git_checkout_tree( int git_checkout_head( git_repository *repo, - git_checkout_opts *opts) + const git_checkout_opts *opts) { int error; git_tree *head = NULL; diff --git a/src/checkout.h b/src/checkout.h index b1dc80c38..6d7186860 100644 --- a/src/checkout.h +++ b/src/checkout.h @@ -19,6 +19,6 @@ */ extern int git_checkout_iterator( git_iterator *target, - git_checkout_opts *opts); + const git_checkout_opts *opts); #endif diff --git a/src/clone.c b/src/clone.c index 904be1b57..60525939f 100644 --- a/src/clone.c +++ b/src/clone.c @@ -331,7 +331,7 @@ on_error: static bool should_checkout( git_repository *repo, bool is_bare, - git_checkout_opts *opts) + const git_checkout_opts *opts) { if (is_bare) return false; @@ -345,7 +345,7 @@ static bool should_checkout( return !git_repository_head_unborn(repo); } -int git_clone_into(git_repository *repo, git_remote *remote, git_checkout_opts *co_opts, const char *branch) +int git_clone_into(git_repository *repo, git_remote *remote, const git_checkout_opts *co_opts, const char *branch) { int error = 0, old_fetchhead; size_t nspecs; |