diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:12 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:12 +0900 |
| commit | a173dddf4483ed11b228077078becc8b65174b46 (patch) | |
| tree | c63671919033c027195c496c5a162f1e175657db /git-submodule.sh | |
| parent | Merge branch 'lm/credential-netrc' (diff) | |
| parent | git-submodule.sh: try harder to fetch a submodule (diff) | |
| download | tgif-a173dddf4483ed11b228077078becc8b65174b46.tar.xz | |
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
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index fd0fe081a8..78073cd87d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -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 |