Skip to content

Cover git update branch selection #310

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
codeforester merged 1 commit into from
May 30, 2026
Merged

Cover git update branch selection #310

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions lib/bash/git/lib_git.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ _git_expected_update_branch() {
fi
fi

if git show-ref --verify --quiet refs/remotes/origin/main; then
printf '%s\n' main
return 0
fi

if git show-ref --verify --quiet refs/remotes/origin/master; then
printf '%s\n' master
return 0
fi

if git show-ref --verify --quiet refs/heads/main; then
printf '%s\n' main
return 0
Expand Down
76 changes: 76 additions & 0 deletions lib/bash/git/tests/lib_git.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,55 @@ setup() {
[[ "$output" != *"not 'master'"* ]]
}

@test "_git_expected_update_branch returns main when origin has main" {
local repo="$TEST_TMPDIR/repo"
local branch

init_git_repo "$repo"
printf 'base\n' > "$repo/data.txt"
commit_all "$repo" "Initial commit"
git -C "$repo" update-ref refs/remotes/origin/main HEAD
git -C "$repo" checkout --detach >/dev/null 2>&1
git -C "$repo" branch -D master >/dev/null 2>&1

pushd "$repo" >/dev/null
branch="$(_git_expected_update_branch)"
popd >/dev/null

[ "$branch" = "main" ]
}

@test "_git_expected_update_branch returns master when origin only has master" {
local repo="$TEST_TMPDIR/repo"
local branch

init_git_repo "$repo"
printf 'base\n' > "$repo/data.txt"
commit_all "$repo" "Initial commit"
git -C "$repo" update-ref refs/remotes/origin/master HEAD
git -C "$repo" checkout --detach >/dev/null 2>&1
git -C "$repo" branch -D master >/dev/null 2>&1

pushd "$repo" >/dev/null
branch="$(_git_expected_update_branch)"
popd >/dev/null

[ "$branch" = "master" ]
}

@test "_git_expected_update_branch falls back to master without main or master refs" {
local repo="$TEST_TMPDIR/repo"
local branch

init_git_repo "$repo"

pushd "$repo" >/dev/null
branch="$(_git_expected_update_branch)"
popd >/dev/null

[ "$branch" = "master" ]
}

@test "_git_only_path_dirty accepts multiple dirty files under an allowed directory" {
local repo="$TEST_TMPDIR/repo"
local rc
Expand Down Expand Up @@ -127,6 +176,33 @@ setup() {
! compgen -G "$temp_dir/git_log.*" >/dev/null
}

@test "_git_update_repo_finish removes temp log after success" {
local git_log="$TEST_TMPDIR/git.log"

printf 'pull output\n' > "$git_log"

bats_run _git_update_repo_finish "$git_log" false 0

[ "$status" -eq 0 ]
[ ! -e "$git_log" ]
}

@test "_git_update_repo_finish preserves an existing RETURN trap" {
local git_log="$TEST_TMPDIR/git.log"
local return_trap

printf 'pull output\n' > "$git_log"
trap 'printf "outer return trap\n"' RETURN

bats_run _git_update_repo_finish "$git_log" false 0
return_trap="$(trap -p RETURN)"
trap - RETURN

[ "$status" -eq 0 ]
[[ "$return_trap" == *"outer return trap"* ]]
[ ! -e "$git_log" ]
}

@test "_git_pull_with_retry retries once after a transient pull failure" {
local git_log="$TEST_TMPDIR/git.log"
local pull_count="$TEST_TMPDIR/pull-count"
Expand Down
Loading