undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jt/submodule-fetch-errmsg'

Browse Source 
Error message update.

* jt/submodule-fetch-errmsg:
  submodule: explain first attempt failure clearly
This commit is contained in:
Junio C Hamano 2019-04-10 02:14:26 +09:00
commit 32414ceb85
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-submodule.sh
View File

@ -594,7 +594,7 @@ cmd_update()
# is not reachable from a ref. # is not reachable from a ref.
is_tip_reachable "$sm_path" "$sha1" || is_tip_reachable "$sm_path" "$sha1" ||
fetch_in_submodule "$sm_path" $depth || fetch_in_submodule "$sm_path" $depth ||
say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")" say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'; trying to directly fetch \$sha1:")"
# Now we tried the usual fetch, but $sha1 may # Now we tried the usual fetch, but $sha1 may
# not be reachable from any of the refs # not be reachable from any of the refs

7
submodule.c
View File

@ -1548,6 +1548,13 @@ static int fetch_finish(int retvalue, struct strbuf *err,
struct oid_array *commits; struct oid_array *commits;
if (retvalue) if (retvalue)
/*
* NEEDSWORK: This indicates that the overall fetch
* failed, even though there may be a subsequent fetch
* by commit hash that might work. It may be a good
* idea to not indicate failure in this case, and only
* indicate failure if the subsequent fetch fails.
*/
spf->result = 1; spf->result = 1;
if (!task || !task->sub) if (!task || !task->sub)