feat: Enable cloning branches with --branch option. Closes #20 and closes #30

Previously, the branch was passed in with 'ref'. This was removed (tests removed)

Author: hyperupcall

docs/reference.md

@@ -8,7 +8,7 @@ The location of the root `bpm` folder. Defaults to `"${XDG_DATA_HOME:-$HOME/.loc
 
 ### `BPM_FULL_CLONE`
 
-Set to a non-null string to clone the full repository history instead of only the last commit. By default, only the latest commit is cloned (`--depth=1`)
+Set to a non-null string to clone the full repository history instead of only the last commit. By default, only the latest commit is cloned (`--depth=1`). The only exception to this is when a specific version is specified with `@v0.1.0` notation. When that is specified, the whole history is downloaded
 
 ### `BPM_PREFIX`
 

pkg/lib/commands/do-add.sh

@@ -3,6 +3,7 @@
 do-add() {
 	local flag_ssh='no'
 	local flag_all='no'
+	local flag_branch=
 
 	util.setup_mode
 
@@ -15,6 +16,13 @@ do-add() {
 		--all)
 			flag_all='yes'
 			;;
+		--branch=*)
+			IFS='=' read -r discard flag_branch <<< "$arg"
+
+			if [ -z "$flag_branch" ]; then
+				die "Branch cannot be empty"
+			fi
+			;;
 		*)
 			pkgs+=("$arg")
 			;;
@@ -61,7 +69,7 @@ do-add() {
 		fi
 
 		log.info "Adding '$repoSpec'"
-		do-plumbing-clone "$uri" "$site/$package" "$ref"
+		do-plumbing-clone "$uri" "$site/$package" "$ref" "$flag_branch"
 		do-plumbing-add-deps "$site/$package"
 		do-plumbing-link-bins "$site/$package"
 		do-plumbing-link-completions "$site/$package"

pkg/lib/commands/do-plumbing-clone.sh

@@ -4,22 +4,24 @@ do-plumbing-clone() {
 	local uri="$1"
 	local id="$2"
 	local ref="$3"
+	local branch="$4"
 
 	ensure.non_zero 'uri' "$uri"
 	ensure.non_zero 'id' "$id"
 
+	# TODO this is invalid in the test suite
 	if [ -e "$BPM_PACKAGES_PATH/$id" ]; then
 		die "Package '$id' is already present"
 	fi
 
 	local -a git_args=(--recursive)
 
-	if [ -z "${BPM_FULL_CLONE+x}" ]; then
+	if [[ -z "${BPM_FULL_CLONE+x}" && -z "$ref" ]]; then
 		git_args+=(--depth=1)
 	fi
 
-	if [ -n "$ref" ]; then
-		git_args+=(--branch "$ref")
+	if [ -n "$branch" ]; then
+		git_args+=(--single-branch --branch "$branch")
 	fi
 
 	git_args+=("$uri")

tests/do-plumbing-clone.bats

@@ -3,6 +3,8 @@
 load 'util/init.sh'
 
 @test "install a specific version" {
+	skip
+
 	test_util.stub_command git
 
 	run do-plumbing-clone https://site/username/package.git username/package version
@@ -81,3 +83,12 @@ load 'util/init.sh'
 	assert_success
 	assert_line -n 1 "git clone --recursive --depth=1 git@site:username/package.git $BPM_PACKAGES_PATH/username/package"
 }
+
+@test "setting branch works" {
+	test_util.stub_command git
+
+	run do-plumbing-clone https://github.com/username/package.git github.com/username/package '' a_branch
+
+	assert_success
+	assert_line -n 1 "git clone --recursive --depth=1 --single-branch --branch a_branch https://github.com/username/package.git $BPM_PACKAGES_PATH/github.com/username/package"
+}