Skip to content

Add heuristic for finding default remote name #2318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add heuristic for finding default remote name #2318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions lib/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ function _bash-it-update-() {
fi

if [[ -z "$BASH_IT_REMOTE" ]]; then
BASH_IT_REMOTE="origin"
BASH_IT_REMOTE=$(_remote_name)
fi

git fetch "$BASH_IT_REMOTE" --tags &> /dev/null
Expand Down Expand Up @@ -352,7 +352,7 @@ function _bash-it-version() {
pushd "${BASH_IT?}" > /dev/null || return

if [[ -z "${BASH_IT_REMOTE:-}" ]]; then
BASH_IT_REMOTE="origin"
BASH_IT_REMOTE=$(_remote_name)
fi

BASH_IT_GIT_REMOTE="$(git remote get-url "$BASH_IT_REMOTE")"
Expand Down Expand Up @@ -951,6 +951,24 @@ function pathmunge() {
fi
}

function _remote_name() {
local branch
branch=$(git branch --show-current)

local remote_name=
remote_name=$(git config --get --default '' "branch.$branch.remote")
if [[ -n "$remote_name" ]]; then
printf '%s\n' "$remote_name"
return
fi

if remote_name=$(git remote -v | awk 'NR==1 { name=$1; print name } $1 != name { exit 1 }'); then
printf '%s\n' "$remote_name"
else
printf '%s\n' 'origin'
fi
}

# `_bash-it-find-in-ancestor` uses the shell's ability to run a function in
# a subshell to simplify our search to a simple `cd ..` and `[[ -r $1 ]]`
# without any external dependencies. Let the shell do what it's good at.
Expand Down
Loading