diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 28 | ||||
| -rw-r--r-- | src/checkout.h | 2 | ||||
| -rw-r--r-- | src/clone.c | 4 | ||||
| -rw-r--r-- | src/reset.c | 2 | ||||
| -rw-r--r-- | src/revert.c | 24 | ||||
| -rw-r--r-- | src/stash.c | 2 |
6 files changed, 31 insertions, 31 deletions
diff --git a/src/checkout.c b/src/checkout.c index 4ef8da076..5dd4ec71c 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -47,7 +47,7 @@ enum { typedef struct { git_repository *repo; git_diff *diff; - git_checkout_opts opts; + git_checkout_options opts; bool opts_free_baseline; char *pfx; git_index *index; @@ -1144,7 +1144,7 @@ static int blob_content_to_file( const char *path, const char * hint_path, mode_t entry_filemode, - git_checkout_opts *opts) + git_checkout_options *opts) { int error = 0; mode_t file_mode = opts->file_mode ? opts->file_mode : entry_filemode; @@ -1856,7 +1856,7 @@ static void checkout_data_clear(checkout_data *data) static int checkout_data_init( checkout_data *data, git_iterator *target, - const git_checkout_opts *proposed) + const git_checkout_options *proposed) { int error = 0; git_repository *repo = git_iterator_owner(target); @@ -1875,12 +1875,12 @@ static int checkout_data_init( data->repo = repo; GITERR_CHECK_VERSION( - proposed, GIT_CHECKOUT_OPTS_VERSION, "git_checkout_opts"); + proposed, GIT_CHECKOUT_OPTIONS_VERSION, "git_checkout_options"); if (!proposed) - GIT_INIT_STRUCTURE(&data->opts, GIT_CHECKOUT_OPTS_VERSION); + GIT_INIT_STRUCTURE(&data->opts, GIT_CHECKOUT_OPTIONS_VERSION); else - memmove(&data->opts, proposed, sizeof(git_checkout_opts)); + memmove(&data->opts, proposed, sizeof(git_checkout_options)); if (!data->opts.target_directory) data->opts.target_directory = git_repository_workdir(repo); @@ -2000,7 +2000,7 @@ cleanup: int git_checkout_iterator( git_iterator *target, - const git_checkout_opts *opts) + const git_checkout_options *opts) { int error = 0; git_iterator *baseline = NULL, *workdir = NULL; @@ -2106,7 +2106,7 @@ cleanup: int git_checkout_index( git_repository *repo, git_index *index, - const git_checkout_opts *opts) + const git_checkout_options *opts) { int error; git_iterator *index_i; @@ -2141,7 +2141,7 @@ int git_checkout_index( int git_checkout_tree( git_repository *repo, const git_object *treeish, - const git_checkout_opts *opts) + const git_checkout_options *opts) { int error; git_tree *tree = NULL; @@ -2189,19 +2189,19 @@ int git_checkout_tree( int git_checkout_head( git_repository *repo, - const git_checkout_opts *opts) + const git_checkout_options *opts) { assert(repo); return git_checkout_tree(repo, NULL, opts); } -int git_checkout_init_opts(git_checkout_opts* opts, int version) +int git_checkout_init_opts(git_checkout_options* opts, int version) { - if (version != GIT_CHECKOUT_OPTS_VERSION) { - giterr_set(GITERR_INVALID, "Invalid version %d for git_checkout_opts", version); + if (version != GIT_CHECKOUT_OPTIONS_VERSION) { + giterr_set(GITERR_INVALID, "Invalid version %d for git_checkout_options", version); return -1; } else { - git_checkout_opts o = GIT_CHECKOUT_OPTS_INIT; + git_checkout_options o = GIT_CHECKOUT_OPTIONS_INIT; memcpy(opts, &o, sizeof(o)); return 0; } diff --git a/src/checkout.h b/src/checkout.h index 6d7186860..f1fe69628 100644 --- a/src/checkout.h +++ b/src/checkout.h @@ -19,6 +19,6 @@ */ extern int git_checkout_iterator( git_iterator *target, - const git_checkout_opts *opts); + const git_checkout_options *opts); #endif diff --git a/src/clone.c b/src/clone.c index b5333bdb7..e19d02ba2 100644 --- a/src/clone.c +++ b/src/clone.c @@ -322,7 +322,7 @@ on_error: static bool should_checkout( git_repository *repo, bool is_bare, - const git_checkout_opts *opts) + const git_checkout_options *opts) { if (is_bare) return false; @@ -336,7 +336,7 @@ static bool should_checkout( return !git_repository_head_unborn(repo); } -int git_clone_into(git_repository *repo, git_remote *remote, const git_checkout_opts *co_opts, const char *branch, const git_signature *signature) +int git_clone_into(git_repository *repo, git_remote *remote, const git_checkout_options *co_opts, const char *branch, const git_signature *signature) { int error = 0, old_fetchhead; git_strarray refspecs; diff --git a/src/reset.c b/src/reset.c index 2a78d312c..e403e2a9a 100644 --- a/src/reset.c +++ b/src/reset.c @@ -102,7 +102,7 @@ int git_reset( git_index *index = NULL; git_tree *tree = NULL; int error = 0; - git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT; + git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; git_buf log_message_buf = GIT_BUF_INIT; assert(repo && target); diff --git a/src/revert.c b/src/revert.c index a397a8eeb..8e84463db 100644 --- a/src/revert.c +++ b/src/revert.c @@ -67,8 +67,8 @@ cleanup: static int revert_normalize_opts( git_repository *repo, - git_revert_opts *opts, - const git_revert_opts *given, + git_revert_options *opts, + const git_revert_options *given, const char *their_label) { int error = 0; @@ -78,10 +78,10 @@ static int revert_normalize_opts( GIT_UNUSED(repo); if (given != NULL) - memcpy(opts, given, sizeof(git_revert_opts)); + memcpy(opts, given, sizeof(git_revert_options)); else { - git_revert_opts default_opts = GIT_REVERT_OPTS_INIT; - memcpy(opts, &default_opts, sizeof(git_revert_opts)); + git_revert_options default_opts = GIT_REVERT_OPTIONS_INIT; + memcpy(opts, &default_opts, sizeof(git_revert_options)); } if (!opts->checkout_opts.checkout_strategy) @@ -166,9 +166,9 @@ done: int git_revert( git_repository *repo, git_commit *commit, - const git_revert_opts *given_opts) + const git_revert_options *given_opts) { - git_revert_opts opts; + git_revert_options opts; git_reference *our_ref = NULL; git_commit *our_commit = NULL; char commit_oidstr[GIT_OID_HEXSZ + 1]; @@ -179,7 +179,7 @@ int git_revert( assert(repo && commit); - GITERR_CHECK_VERSION(given_opts, GIT_REVERT_OPTS_VERSION, "git_revert_opts"); + GITERR_CHECK_VERSION(given_opts, GIT_REVERT_OPTIONS_VERSION, "git_revert_options"); if ((error = git_repository__ensure_not_bare(repo, "revert")) < 0) return error; @@ -219,13 +219,13 @@ done: return error; } -int git_revert_init_opts(git_revert_opts* opts, int version) +int git_revert_init_opts(git_revert_options* opts, int version) { - if (version != GIT_REVERT_OPTS_VERSION) { - giterr_set(GITERR_INVALID, "Invalid version %d for git_revert_opts", version); + if (version != GIT_REVERT_OPTIONS_VERSION) { + giterr_set(GITERR_INVALID, "Invalid version %d for git_revert_options", version); return -1; } else { - git_revert_opts o = GIT_REVERT_OPTS_INIT; + git_revert_options o = GIT_REVERT_OPTIONS_INIT; memcpy(opts, &o, sizeof(o)); return 0; } diff --git a/src/stash.c b/src/stash.c index 0c9101294..d20e29b80 100644 --- a/src/stash.c +++ b/src/stash.c @@ -468,7 +468,7 @@ static int reset_index_and_workdir( bool remove_untracked, bool remove_ignored) { - git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT; + git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; opts.checkout_strategy = GIT_CHECKOUT_FORCE; |