summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-11 10:31:04 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-11 10:31:04 -0700
commitbb2d8a817df91c68742e10ace2a791de176f7247 (patch)
tree615ed2efe90c6434e3b5bde3cc0d5418f6d09587 /git-submodule.sh
parent89b8710fce0d1b3d99c0a1c218bacb82ff0811e4 (diff)
parentbb9d91b4ed54df7bd970c82971ba2851e6735d72 (diff)
downloadgit-bb2d8a817df91c68742e10ace2a791de176f7247.tar.gz
Merge branch 'sb/submodule-clone-retry'
"git submodule update" that drives many "git clone" could eventually hit flaky servers/network conditions on one of the submodules; the command learned to retry the attempt. * sb/submodule-clone-retry: submodule update: continue when a clone fails submodule--helper: initial clone learns retry logic
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 b39ac106ec..7c62b53cc0 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -705,7 +705,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