Skip to content

Add the .git subdir as another safe.directory on Cygwin CI #1916

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 2 commits into from
May 27, 2024
Merged

Add the .git subdir as another safe.directory on Cygwin CI #1916

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf81c6c
Momentarily downgrade Git on Cygwin to investigate failures
EliahKagan May 26, 2024
eb06a18
Unpin Cygwin `git`; add our `.git` as a `safe.directory`
EliahKagan May 26, 2024
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
Prev Previous commit
Unpin Cygwin git; add our .git as a safe.directory 
This undoes the change of pinning Git to an earlier version (before
the recent security update) on Cygwin, and instead adds the `.git`
subdirectory of the `GitPython` directory as an additional value of
the multi-valued `safe.directory` Git configuration variable.
  • Loading branch information
@EliahKagan
EliahKagan committed May 26, 2024
commit eb06a18d83eda0ae04e2a00b2d656da147e9188a
3 changes: 2 additions & 1 deletion .github/workflows/cygwin-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Cygwin
uses: egor-tensin/setup-cygwin@v4
with:
packages: python39=3.9.16-1 python39-pip python39-virtualenv git=2.43.0-1
packages: python39=3.9.16-1 python39-pip python39-virtualenv git

- name: Arrange for verbose output
run: |
Expand All @@ -40,6 +40,7 @@ jobs:
- name: Special configuration for Cygwin git
run: |
git config --global --add safe.directory "$(pwd)"
git config --global --add safe.directory "$(pwd)/.git"
git config --global core.autocrlf false

- name: Prepare this repo for tests
Expand Down