diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-11 12:01:08 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-22 17:02:56 +0200 |
| commit | 783672fa5be4f0e9dce72bcd74690258bdbac0a9 (patch) | |
| tree | d50a17c6e2fb70a54d01152c3c464dd317ebc7b3 | |
| parent | 0496330004e64680903131cbae2ac27610517cd1 (diff) | |
| download | libgit2-cmn/submodule-config-state.tar.gz | |
submodule: remove the RESET enum valuescmn/submodule-config-state
These are not useful anymore, as we don't affect the instance's
configuration.
| -rw-r--r-- | include/git2/submodule.h | 4 | ||||
| -rw-r--r-- | include/git2/types.h | 6 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/git2/submodule.h b/include/git2/submodule.h index 0169d1c27..cbafccd1b 100644 --- a/include/git2/submodule.h +++ b/include/git2/submodule.h @@ -459,9 +459,7 @@ GIT_EXTERN(int) git_submodule_set_ignore( * Get the update rule that will be used for the submodule. * * This value controls the behavior of the `git submodule update` command. - * There are four useful values documented with `git_submodule_update_t` - * plus the `GIT_SUBMODULE_UPDATE_RESET` which can be used to revert to - * the on-disk setting. + * There are four useful values documented with `git_submodule_update_t`. * * @param submodule The submodule to check * @return The current git_submodule_update_t value that will be used diff --git a/include/git2/types.h b/include/git2/types.h index aa0f31a9a..3da0d4a26 100644 --- a/include/git2/types.h +++ b/include/git2/types.h @@ -337,7 +337,6 @@ typedef struct git_submodule git_submodule; * * The values are: * - * - GIT_SUBMODULE_UPDATE_RESET: reset to the on-disk value. * - GIT_SUBMODULE_UPDATE_CHECKOUT: the default; when a submodule is * updated, checkout the new detached HEAD to the submodule directory. * - GIT_SUBMODULE_UPDATE_REBASE: update by rebasing the current checked @@ -350,8 +349,6 @@ typedef struct git_submodule git_submodule; * when we don't want any particular update rule to be specified. */ typedef enum { - GIT_SUBMODULE_UPDATE_RESET = -1, - GIT_SUBMODULE_UPDATE_CHECKOUT = 1, GIT_SUBMODULE_UPDATE_REBASE = 2, GIT_SUBMODULE_UPDATE_MERGE = 3, @@ -401,15 +398,12 @@ typedef enum { * * Represent the value of `submodule.$name.fetchRecurseSubmodules` * - * * GIT_SUBMODULE_RECURSE_RESET - reset to the on-disk value * * GIT_SUBMODULE_RECURSE_NO - do no recurse into submodules * * GIT_SUBMODULE_RECURSE_YES - recurse into submodules * * GIT_SUBMODULE_RECURSE_ONDEMAND - recurse into submodules only when * commit not already in local clone */ typedef enum { - GIT_SUBMODULE_RECURSE_RESET = -1, - GIT_SUBMODULE_RECURSE_NO = 0, GIT_SUBMODULE_RECURSE_YES = 1, GIT_SUBMODULE_RECURSE_ONDEMAND = 2, |