Commit 783672fa5be4f0e9dce72bcd74690258bdbac0a9
2015-05-11T12:01:08
submodule: remove the RESET enum values These are not useful anymore, as we don't affect the instance's configuration.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
diff --git a/include/git2/submodule.h b/include/git2/submodule.h
index 0169d1c..cbafccd 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 aa0f31a..3da0d4a 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,