summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Heiko Voigt <hvoigt@hvoigt.net>2015-08-17 17:22:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-08-19 11:43:10 -0700
commit027771fcb153e0003bcb2d68e1838594a48b0161 (patch)
tree688a3f852ef82161a77db7ec8fd7c59ce601b956 /builtin/merge.c
parentsubmodule: use new config API for worktree configurations (diff)
downloadtgif-027771fcb153e0003bcb2d68e1838594a48b0161.tar.xz
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 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions