diff --git a/.github/workflows/ci-bats-macos.yaml b/.github/workflows/ci-bats-macos.yaml index 9859b81e74..c4f0cd58e6 100644 --- a/.github/workflows/ci-bats-macos.yaml +++ b/.github/workflows/ci-bats-macos.yaml @@ -86,6 +86,12 @@ jobs: run: | dolt config --global --add user.name 'Dolthub Actions' dolt config --global --add user.email 'actions@dolthub.com' + - name: Setup Git Config + run: | + git --version + git config --global user.name 'Dolthub Actions' + git config --global user.email 'actions@dolthub.com' + git config --global init.defaultBranch main - name: Install Maven working-directory: ./.ci_bin run: | diff --git a/.github/workflows/ci-bats-unix.yaml b/.github/workflows/ci-bats-unix.yaml index 01a895646f..672a859e94 100644 --- a/.github/workflows/ci-bats-unix.yaml +++ b/.github/workflows/ci-bats-unix.yaml @@ -96,6 +96,12 @@ jobs: run: | dolt config --global --add user.name 'Dolthub Actions' dolt config --global --add user.email 'actions@dolthub.com' + - name: Setup Git Config + run: | + git --version + git config --global user.name 'Dolthub Actions' + git config --global user.email 'actions@dolthub.com' + git config --global init.defaultBranch main - name: Install expect if: matrix.os == 'ubuntu-22.04' run: sudo apt-get install -y expect diff --git a/.github/workflows/ci-bats-windows.yaml b/.github/workflows/ci-bats-windows.yaml index ee14292ade..fc54e7a050 100644 --- a/.github/workflows/ci-bats-windows.yaml +++ b/.github/workflows/ci-bats-windows.yaml @@ -149,6 +149,12 @@ jobs: run: | dolt config --global --add user.name 'Dolthub Actions' dolt config --global --add user.email 'actions@dolthub.com' + - name: Setup Git Config + run: | + git --version + git config --global user.name 'Dolthub Actions' + git config --global user.email 'actions@dolthub.com' + git config --global init.defaultBranch main - name: Test file run: bats --tap ${{ matrix.file }} working-directory: ./integration-tests/bats diff --git a/integration-tests/bats/remotes-git.bats b/integration-tests/bats/remotes-git.bats index 8d6a987d59..ba5834cb53 100644 --- a/integration-tests/bats/remotes-git.bats +++ b/integration-tests/bats/remotes-git.bats @@ -25,7 +25,24 @@ teardown() { # Helper function to create a bare git repository create_bare_git_repo() { local name=$1 - git init --bare "git-remotes/${name}.git" > /dev/null 2>&1 + local repo_path="git-remotes/${name}.git" + + # Debug output + echo "DEBUG: Creating bare git repo: ${repo_path}" + echo "DEBUG: Current directory: $(pwd)" + echo "DEBUG: PATH=${PATH}" + echo "DEBUG: which git: $(which git 2>&1)" + echo "DEBUG: git --version: $(git --version 2>&1)" + echo "DEBUG: /usr/bin/git exists: $(test -x /usr/bin/git && echo 'yes' || echo 'no')" + + # Try to create the repo + if ! git init --bare "${repo_path}"; then + echo "DEBUG: git init failed with exit code $?" + return 1 + fi + + echo "DEBUG: Successfully created ${repo_path}" + ls -la "${repo_path}" } @test "remotes-git: remote init creates dolt structure" {