|
Lines 710-725
Link Here
|
| 710 |
local subname=${submodules[0]} |
710 |
local subname=${submodules[0]} |
| 711 |
local url=${submodules[1]} |
711 |
local url=${submodules[1]} |
| 712 |
local path=${submodules[2]} |
712 |
local path=${submodules[2]} |
| 713 |
local commit=$(git rev-parse "${local_ref}:${path}") |
|
|
| 714 |
|
713 |
|
| 715 |
if [[ ! ${commit} ]]; then |
714 |
# use only submodules for which path does exist |
| 716 |
die "Unable to get commit id for submodule ${subname}" |
715 |
# (this is in par with 'git submodule'), bug #551100 |
| 717 |
fi |
716 |
if git cat-file -e "${local_ref}:${path}" &>/dev/null |
|
|
717 |
then |
| 718 |
local commit=$(git rev-parse "${local_ref}:${path}" || die) |
| 719 |
|
| 720 |
if [[ ! ${commit} ]]; then |
| 721 |
die "Unable to get commit id for submodule ${subname}" |
| 722 |
fi |
| 718 |
|
723 |
|
| 719 |
local subrepos |
724 |
local subrepos |
| 720 |
_git-r3_set_subrepos "${url}" "${repos[@]}" |
725 |
_git-r3_set_subrepos "${url}" "${repos[@]}" |
| 721 |
|
726 |
|
| 722 |
git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}" |
727 |
git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}" |
|
|
728 |
fi |
| 723 |
|
729 |
|
| 724 |
submodules=( "${submodules[@]:3}" ) # shift |
730 |
submodules=( "${submodules[@]:3}" ) # shift |
| 725 |
done |
731 |
done |
|
Lines 849-859
Link Here
|
| 849 |
local subname=${submodules[0]} |
855 |
local subname=${submodules[0]} |
| 850 |
local url=${submodules[1]} |
856 |
local url=${submodules[1]} |
| 851 |
local path=${submodules[2]} |
857 |
local path=${submodules[2]} |
| 852 |
local subrepos |
|
|
| 853 |
_git-r3_set_subrepos "${url}" "${repos[@]}" |
| 854 |
|
858 |
|
| 855 |
git-r3_checkout "${subrepos[*]}" "${out_dir}/${path}" \ |
859 |
# use only submodules for which path does exist |
| 856 |
"${local_id}/${subname}" |
860 |
# (this is in par with 'git submodule'), bug #551100 |
|
|
861 |
if [[ -d ${path} ]]; then |
| 862 |
local subrepos |
| 863 |
_git-r3_set_subrepos "${url}" "${repos[@]}" |
| 864 |
|
| 865 |
git-r3_checkout "${subrepos[*]}" "${out_dir}/${path}" \ |
| 866 |
"${local_id}/${subname}" |
| 867 |
fi |
| 857 |
|
868 |
|
| 858 |
submodules=( "${submodules[@]:3}" ) # shift |
869 |
submodules=( "${submodules[@]:3}" ) # shift |
| 859 |
done |
870 |
done |
