Skip to content

Commit a173ddd

Browse files
committed
Merge branch 'sb/submodule-update-try-harder'
"git submodule update" attempts two different kinds of "git fetch" against the upstream repository to grab a commit bound at the submodule's path, but it incorrectly gave up if the first kind (i.e. a normal fetch) failed, making the second "last resort" one (i.e. fetching an exact commit object by object name) ineffective. This has been corrected. * sb/submodule-update-try-harder: git-submodule.sh: try harder to fetch a submodule
2 parents 017b7c5 + e30d833 commit a173ddd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-submodule.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ cmd_update()
630630
# is not reachable from a ref.
631631
is_tip_reachable "$sm_path" "$sha1" ||
632632
fetch_in_submodule "$sm_path" $depth ||
633-
die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
633+
say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
634634

635635
# Now we tried the usual fetch, but $sha1 may
636636
# not be reachable from any of the refs

0 commit comments

Comments
 (0)