diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/checkout.c | 2 | ||||
| -rw-r--r-- | src/diff_file.c | 2 | ||||
| -rw-r--r-- | src/fetch.c | 2 | ||||
| -rw-r--r-- | src/remote.c | 4 | ||||
| -rw-r--r-- | src/submodule.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/checkout.c b/src/checkout.c index 351e8b0ef..a94d509d3 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -180,7 +180,7 @@ static bool checkout_is_workdir_modified( return true; } - if (git_submodule_status(&sm_status, data->repo, wditem->path, GIT_SUBMODULE_IGNORE_FALLBACK) < 0 || + if (git_submodule_status(&sm_status, data->repo, wditem->path, GIT_SUBMODULE_IGNORE_UNSPECIFIED) < 0 || GIT_SUBMODULE_STATUS_IS_WD_DIRTY(sm_status)) rval = true; else if ((sm_oid = git_submodule_wd_id(sm)) == NULL) diff --git a/src/diff_file.c b/src/diff_file.c index 28edcd4c1..c60362865 100644 --- a/src/diff_file.c +++ b/src/diff_file.c @@ -186,7 +186,7 @@ static int diff_file_content_commit_to_str( return error; } - if ((error = git_submodule_status(&sm_status, fc->repo, fc->file->path, GIT_SUBMODULE_IGNORE_FALLBACK)) < 0) { + if ((error = git_submodule_status(&sm_status, fc->repo, fc->file->path, GIT_SUBMODULE_IGNORE_UNSPECIFIED)) < 0) { git_submodule_free(sm); return error; } diff --git a/src/fetch.c b/src/fetch.c index 82d86bbce..4d895752c 100644 --- a/src/fetch.c +++ b/src/fetch.c @@ -60,7 +60,7 @@ static int filter_wants(git_remote *remote, const git_fetch_options *opts) size_t i, heads_len; git_remote_autotag_option_t tagopt = remote->download_tags; - if (opts && opts->download_tags != GIT_REMOTE_DOWNLOAD_TAGS_FALLBACK) + if (opts && opts->download_tags != GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED) tagopt = opts->download_tags; git_vector_clear(&remote->refs); diff --git a/src/remote.c b/src/remote.c index 7c2d99937..4dbcb3b1a 100644 --- a/src/remote.c +++ b/src/remote.c @@ -985,7 +985,7 @@ int git_remote_fetch( if (opts && opts->prune == GIT_FETCH_PRUNE) prune = true; - else if (opts && opts->prune == GIT_FETCH_PRUNE_FALLBACK && remote->prune_refs) + else if (opts && opts->prune == GIT_FETCH_PRUNE_UNSPECIFIED && remote->prune_refs) prune = true; else if (opts && opts->prune == GIT_FETCH_NO_PRUNE) prune = false; @@ -1539,7 +1539,7 @@ int git_remote_update_tips( if ((error = ls_to_vector(&refs, remote)) < 0) goto out; - if (download_tags == GIT_REMOTE_DOWNLOAD_TAGS_FALLBACK) + if (download_tags == GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED) tagopt = remote->download_tags; else tagopt = download_tags; diff --git a/src/submodule.c b/src/submodule.c index 45163da1b..796364bb8 100644 --- a/src/submodule.c +++ b/src/submodule.c @@ -1030,7 +1030,7 @@ int git_submodule_update(git_submodule *sm, int init, git_submodule_update_optio memcpy(&clone_options.fetch_opts, &update_options.fetch_opts, sizeof(git_fetch_options)); /* Get the status of the submodule to determine if it is already initialized */ - if ((error = git_submodule_status(&submodule_status, sm->repo, sm->name, GIT_SUBMODULE_IGNORE_FALLBACK)) < 0) + if ((error = git_submodule_status(&submodule_status, sm->repo, sm->name, GIT_SUBMODULE_IGNORE_UNSPECIFIED)) < 0) goto done; /* @@ -1425,7 +1425,7 @@ int git_submodule__status( unsigned int status; git_repository *smrepo = NULL; - if (ign == GIT_SUBMODULE_IGNORE_FALLBACK) + if (ign == GIT_SUBMODULE_IGNORE_UNSPECIFIED) ign = sm->ignore; /* only return location info if ignore == all */ |