diff options
| author | Mark Ferrell <major@homeonderanged.org> | 2013-09-23 12:32:29 -0700 |
|---|---|---|
| committer | Mark Ferrell <major@homeonderanged.org> | 2013-09-23 12:32:29 -0700 |
| commit | 7fad9171c3cdf1ae01f95b0bd2771cb200af8042 (patch) | |
| tree | e3305e7b5af14dc19e540c4e096d52bb6c3fd63c | |
| parent | 8ca540b9f0730711eaab9a6c677c74a69a64784b (diff) | |
Cherry-picked 240d08677553791b11c31799216f14b13e3e4c43
* The builder tree and a project tree using builder had gotten out of sync in
regards to changes. This patch pulls useful changes from the project tree
that should have gone here instead.
| -rwxr-xr-x | builder/build-fetch | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/builder/build-fetch b/builder/build-fetch index 3082612..1973755 100755 --- a/builder/build-fetch +++ b/builder/build-fetch @@ -98,40 +98,31 @@ build_fetch_git() (*) build_fetch_git_uri="git://${build_fetch_git_uri}";; esac - if [ "${build_fetch_git_tag}" != "${build_fetch_git_uri}" ]; then - mkdir "${build_fetch_git_dir}" - if ! cd "${build_fetch_git_dir}"; then - die "failed to change working directory to '${build_fetch_git_dir}'" - fi - - if ! git init -q; then - die "failed to initialize git directory" - fi + if [ ! -z "${build_fetch_git_tag}" ]; then + case "${build_fetch_git_tag}" in + (tags/*) + if ! git clone --depth 1 "${build_fetch_git_uri}" "${build_fetch_git_dir}"; then + die "failed to clone git source at '${build_fetch_git_uri}'" + fi - git remote add origin "${build_fetch_git_uri}" + if ! cd "${build_fetch_git_dir}"; then + die "failed to change working directory to '${build_fetch_git_dir}'" + fi - if [ ! -z "${build_fetch_git_tag}" ]; then - if ! git fetch --depth 1 "${build_fetch_git_uri}" "${build_fetch_git_tag}"; then + if ! git fetch --tags --depth 1 "${build_fetch_git_uri}" "${build_fetch_git_tag}"; then die "failed to fetch git branch/tag '${build_fetch_git_tag}'" fi - case "${build_fetch_git_tag}" in - (tags/*) - mkdir -p .git/refs/tags - if test -f ".git/refs/heads/master"; then - cp .git/refs/heads/master ".git/refs/${build_fetch_git_tag}" - elif test -f ".git/shallow"; then - cp .git/shallow ".git/refs/${build_fetch_git_tag}" - else - die "failed to install reference '${build_fetch_git_tag}'" - fi - ;; - esac - if ! git checkout "${build_fetch_git_tag}"; then die "failed to checkout git branch/tag '${build_fetch_git_tag}'" fi - fi + ;; + (*) + if ! git clone --depth 1 --branch "${build_fetch_git_tag}" "${build_fetch_git_uri}" "${build_fetch_git_dir}"; then + die "failed to clone git source at '${build_fetch_git_uri}'" + fi + ;; + esac else if ! git clone --depth 1 "${build_fetch_git_uri}" "${build_fetch_git_dir}"; then die "failed to clone git source at '${build_fetch_git_uri}'" |