diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-26 01:55:48 +0300 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-26 01:55:48 +0300 |
| commit | c0280bdd1542640a83d732d7c50c30dddf4dc8df (patch) | |
| tree | 477cb103b69c39837068e54553306dd26f62ef62 /include | |
| parent | 552249f941a4364f27e0092649af9ec09d9fa770 (diff) | |
| parent | c2418f461374a618504c261a4c71cdb01bab9f68 (diff) | |
Merge pull request #3255 from libgit2/cmn/rename-unspecified
Rename FALLBACK to UNSPECIFIED
Diffstat (limited to 'include')
| -rw-r--r-- | include/git2/diff.h | 2 | ||||
| -rw-r--r-- | include/git2/remote.h | 6 | ||||
| -rw-r--r-- | include/git2/types.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/git2/diff.h b/include/git2/diff.h index 90e2e1b22..b3ab5397e 100644 --- a/include/git2/diff.h +++ b/include/git2/diff.h @@ -399,7 +399,7 @@ typedef struct { * `git_diff_options_init` programmatic initialization. */ #define GIT_DIFF_OPTIONS_INIT \ - {GIT_DIFF_OPTIONS_VERSION, 0, GIT_SUBMODULE_IGNORE_FALLBACK, {NULL,0}, NULL, NULL, 3} + {GIT_DIFF_OPTIONS_VERSION, 0, GIT_SUBMODULE_IGNORE_UNSPECIFIED, {NULL,0}, NULL, NULL, 3} /** * Initializes a `git_diff_options` with default values. Equivalent to diff --git a/include/git2/remote.h b/include/git2/remote.h index ccd0b43f4..e47f00881 100644 --- a/include/git2/remote.h +++ b/include/git2/remote.h @@ -475,7 +475,7 @@ typedef enum { /** * Use the setting from the configuration */ - GIT_FETCH_PRUNE_FALLBACK, + GIT_FETCH_PRUNE_UNSPECIFIED, /** * Force pruning on */ @@ -495,7 +495,7 @@ typedef enum { /** * Use the setting from the configuration. */ - GIT_REMOTE_DOWNLOAD_TAGS_FALLBACK = 0, + GIT_REMOTE_DOWNLOAD_TAGS_UNSPECIFIED = 0, /** * Ask the server for tags pointing to objects we're already * downloading. @@ -541,7 +541,7 @@ typedef struct { } git_fetch_options; #define GIT_FETCH_OPTIONS_VERSION 1 -#define GIT_FETCH_OPTIONS_INIT { GIT_FETCH_OPTIONS_VERSION, GIT_REMOTE_CALLBACKS_INIT, GIT_FETCH_PRUNE_FALLBACK, 1 } +#define GIT_FETCH_OPTIONS_INIT { GIT_FETCH_OPTIONS_VERSION, GIT_REMOTE_CALLBACKS_INIT, GIT_FETCH_PRUNE_UNSPECIFIED, 1 } /** * Initializes a `git_fetch_options` with default values. Equivalent to diff --git a/include/git2/types.h b/include/git2/types.h index e975c6097..6f41014b3 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -383,7 +383,7 @@ typedef enum { * * The values are: * - * - GIT_SUBMODULE_IGNORE_FALLBACK: use the submodule's configuration + * - GIT_SUBMODULE_IGNORE_UNSPECIFIED: use the submodule's configuration * - GIT_SUBMODULE_IGNORE_NONE: don't ignore any change - i.e. even an * untracked file, will mark the submodule as dirty. Ignored files are * still ignored, of course. @@ -397,7 +397,7 @@ typedef enum { * when we don't want any particular ignore rule to be specified. */ typedef enum { - GIT_SUBMODULE_IGNORE_FALLBACK = -1, /**< use the submodule's configuration */ + GIT_SUBMODULE_IGNORE_UNSPECIFIED = -1, /**< use the submodule's configuration */ GIT_SUBMODULE_IGNORE_NONE = 1, /**< any change or untracked == dirty */ GIT_SUBMODULE_IGNORE_UNTRACKED = 2, /**< dirty if tracked files change */ |