From 929283edb08cbe965637c033ac32c93a243044ea Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Wed, 19 Feb 2020 14:28:43 +0000 Subject: kiss: Fix old behavior FossilOrigin-Name: 4ed7c978a2ca59433dd20757bd2eb73b0d069188109dd8e914975822206a9d98 --- kiss | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/kiss b/kiss index a59a502..956d2d5 100755 --- a/kiss +++ b/kiss @@ -199,15 +199,27 @@ pkg_sources() { # beforehand. cd "$mak_dir/$1/$dest" || die 2>/dev/null + # Clear the argument list as we'll be overwriting + # it below based on what kind of checkout we're + # dealing with. + set -- "$repo_src" + # If a branch was given, shallow clone it directly. # This speeds things up as we don't have to grab # a lot of unneeded commits. - [ "${src##*@*}" ] && set -- || + [ "${src##*@*}" ] || set -- -b "${src##*@}" "${repo_src%@*}" + # Maintain compatibility with older versions of + # kiss by shallow cloning all branches. This has + # the added benefit of allowing checkouts of + # specific commits in specific branches. + [ "${src##*#*}" ] || + set -- --no-single-branch "${repo_src%#*}" + # Always do a shallow clone as we will unshallow it if # needed later (when a commit is desired). - git clone --depth=1 "${@:-${repo_src%#*}}" . + git clone --depth=1 "$@" . ) || die "$1" "Failed to clone $src" -- cgit v1.2.3