summaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorHeiko Voigt <hvoigt@hvoigt.net>2015-08-18 00:22:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-08-19 18:43:10 (GMT)
commit027771fcb153e0003bcb2d68e1838594a48b0161 (patch)
tree688a3f852ef82161a77db7ec8fd7c59ce601b956 /submodule.h
parent851e18c3859ad0f9f7e91fdb4d6cce5a8272420b (diff)
downloadgit-027771fcb153e0003bcb2d68e1838594a48b0161.zip
git-027771fcb153e0003bcb2d68e1838594a48b0161.tar.gz
git-027771fcb153e0003bcb2d68e1838594a48b0161.tar.bz2
submodule: allow erroneous values for the fetchRecurseSubmodules option
We should not die when reading the submodule config cache since the user might not be able to get out of that situation when the configuration is part of the history. We should handle this condition later when the value is about to be used. Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h
index 547219d..5507c3d 100644
--- a/submodule.h
+++ b/submodule.h
@@ -5,6 +5,7 @@ struct diff_options;
struct argv_array;
enum {
+ RECURSE_SUBMODULES_ERROR = -3,
RECURSE_SUBMODULES_NONE = -2,
RECURSE_SUBMODULES_ON_DEMAND = -1,
RECURSE_SUBMODULES_OFF = 0,
@@ -21,7 +22,6 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
int submodule_config(const char *var, const char *value, void *cb);
void gitmodules_config(void);
void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
-int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
void show_submodule_summary(FILE *f, const char *path,
const char *line_prefix,
unsigned char one[20], unsigned char two[20],