summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-06-09 12:06:37 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-13 10:29:06 -0700
commitbb9d91b4ed54df7bd970c82971ba2851e6735d72 (patch)
tree18156eb434fc25d243499832b2ce1b9fa3658aeb /git-submodule.sh
parent665b35eccd39fefd714cb5c332277a6b94fd9386 (diff)
downloadgit-bb9d91b4ed54df7bd970c82971ba2851e6735d72.tar.gz
submodule update: continue when a clone fails
In 15ffb7cde48 (2011-06-13, submodule update: continue when a checkout fails), we reasoned it is ok to continue, when there is not much of a mental burden by the failure. If a recursive submodule fails to clone because a .gitmodules file is broken (e.g. : fatal: No url found for submodule path 'foo/bar' in .gitmodules Failed to recurse into submodule path 'foo', signaled by exit code 128), this is one of the cases where the user is not expected to have much of a burden afterwards, so we can also continue in that case. This means we only want to stop for updating submodules in case of rebase, merge or custom update command failures, which are all signaled with exit code 2. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
-rwxr-xr-xgit-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 42e0e9f63d..f1919ca16f 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -734,7 +734,7 @@ cmd_update()
if test $res -gt 0
then
die_msg="$(eval_gettext "Failed to recurse into submodule path '\$displaypath'")"
- if test $res -eq 1
+ if test $res -ne 2
then
err="${err};$die_msg"
continue