summaryrefslogtreecommitdiff
path: root/src/submodule.c
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2015-06-25 12:48:44 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2015-06-25 12:48:44 +0200
commitc2418f461374a618504c261a4c71cdb01bab9f68 (patch)
treebd608906dc1244c19de052166ee6931abb2f9c98 /src/submodule.c
parentdaacf96d101b9d2100a5028090b5af5249d8893d (diff)
downloadlibgit2-cmn/rename-unspecified.tar.gz
Rename FALLBACK to UNSPECIFIEDcmn/rename-unspecified
Fallback describes the mechanism, while unspecified explains what the user is thinking.
Diffstat (limited to 'src/submodule.c')
-rw-r--r--src/submodule.c4
1 files changed, 2 insertions, 2 deletions
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 */