diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-03-17 11:46:55 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-04-20 16:22:44 -0400 |
| commit | 649834fd6edd5ee2f7cb3e791081b2d57a4d7c41 (patch) | |
| tree | c982e5a0396d5e6ba0189da62233b99080faf9b2 | |
| parent | eaf0d68830cc8fc56c92733a550ea5f6bc15101d (diff) | |
| download | libgit2-649834fd6edd5ee2f7cb3e791081b2d57a4d7c41.tar.gz | |
reset: `git_checkout_options` is `const`
| -rw-r--r-- | include/git2/reset.h | 4 | ||||
| -rw-r--r-- | src/reset.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/git2/reset.h b/include/git2/reset.h index c03dbed8c..37e578e58 100644 --- a/include/git2/reset.h +++ b/include/git2/reset.h @@ -62,7 +62,7 @@ GIT_EXTERN(int) git_reset( git_repository *repo, git_object *target, git_reset_t reset_type, - git_checkout_options *checkout_opts); + const git_checkout_options *checkout_opts); /** * Sets the current head to the specified commit oid and optionally @@ -80,7 +80,7 @@ GIT_EXTERN(int) git_reset_from_annotated( git_repository *repo, git_annotated_commit *commit, git_reset_t reset_type, - git_checkout_options *checkout_opts); + const git_checkout_options *checkout_opts); /** * Updates some entries in the index from the target commit tree. diff --git a/src/reset.c b/src/reset.c index aaebf4198..d08e48cd7 100644 --- a/src/reset.c +++ b/src/reset.c @@ -102,7 +102,7 @@ static int reset( git_object *target, const char *to, git_reset_t reset_type, - git_checkout_options *checkout_opts) + const git_checkout_options *checkout_opts) { git_object *commit = NULL; git_index *index = NULL; @@ -183,7 +183,7 @@ int git_reset( git_repository *repo, git_object *target, git_reset_t reset_type, - git_checkout_options *checkout_opts) + const git_checkout_options *checkout_opts) { return reset(repo, target, git_oid_tostr_s(git_object_id(target)), reset_type, checkout_opts); } @@ -192,7 +192,7 @@ int git_reset_from_annotated( git_repository *repo, git_annotated_commit *commit, git_reset_t reset_type, - git_checkout_options *checkout_opts) + const git_checkout_options *checkout_opts) { return reset(repo, (git_object *) commit->commit, commit->ref_name, reset_type, checkout_opts); } |