Skip to content

Fix remote name detection to work with bash-it repo #2344

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

Merged
merged 3 commits into from
Oct 7, 2025
+17 −2
Merged

Fix remote name detection to work with bash-it repo #2344

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f106333
Add heuristic for finding default remote name
hyperupcall Jun 2, 2025
c0c5e05
Fix remote name detection function
seefood Oct 4, 2025
12dcac3
Apply review feedback: use git --git-dir and simplify awk
seefood Oct 7, 2025
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
19 changes: 17 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=$(_get-git-default-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=$(_get-git-default-remote-name)
fi

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

function _get-git-default-remote-name() {
local branch
branch=$(command git --git-dir="${BASH_IT?}/.git" --work-tree="${BASH_IT?}" branch --show-current)

local remote_name=
remote_name=$(command git --git-dir="${BASH_IT?}/.git" --work-tree="${BASH_IT?}" config --get --default '' "branch.$branch.remote")
if [[ -n "$remote_name" ]]; then
printf '%s\n' "$remote_name"
return
fi

remote_name=$(command git --git-dir="${BASH_IT?}/.git" --work-tree="${BASH_IT?}" remote -v | awk 'NR==1 { print $1 }')
printf '%s\n' "${remote_name:-origin}"
}

# `_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