Merge branch 'sb/submodule-misc-cleanups'

Minor simplification.

* sb/submodule-misc-cleanups:
  submodule update: make use of the existing fetch_in_submodule function
This commit is contained in:
Junio C Hamano 2016-06-20 11:01:01 -07:00
commit de76eb69d2

View File

@ -611,7 +611,7 @@ cmd_update()
if test -z "$nofetch"
then
# Fetch remote before determining tracking $sha1
(sanitize_submodule_env; cd "$sm_path" && git-fetch) ||
fetch_in_submodule "$sm_path" ||
die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
fi
remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)