Browse Source

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
maint
Junio C Hamano 7 years ago
parent
commit
a173dddf44
  1. 2
      git-submodule.sh

2
git-submodule.sh

@ -630,7 +630,7 @@ cmd_update() @@ -630,7 +630,7 @@ cmd_update()
# is not reachable from a ref.
is_tip_reachable "$sm_path" "$sha1" ||
fetch_in_submodule "$sm_path" $depth ||
die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"

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

Loading…
Cancel
Save