Skip to content
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.

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

fix: ignore Git hooks during project update #1066

Merged
merged 4 commits into from
Mar 31, 2023

Conversation

sisp
Copy link
Member

@sisp sisp commented Mar 30, 2023

I've continued work on #888 by extending a test case with the commitizen pre-commit hook because #888 seems abandoned.

Supersedes #888. Fixes #871.

snuufkiin and others added 4 commits December 6, 2022 13:11
To resolve following issue: copier-org#871

-> disable pre-commit-like checks to ensure that there won't be any more conflicts concerning this commit.
@codecov
Copy link

codecov bot commented Mar 30, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.25%. Comparing base (453cbf9) to head (de19204).
Report is 475 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1066      +/-   ##
==========================================
- Coverage   96.31%   96.25%   -0.07%     
==========================================
  Files          43       43              
  Lines        3229     3229              
==========================================
- Hits         3110     3108       -2     
- Misses        119      121       +2     
Flag Coverage Δ
unittests 96.25% <100.00%> (-0.07%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sisp
Copy link
Member Author

sisp commented Mar 30, 2023

I think the test CI / build (ubuntu-latest, 3.8) is failing because of some issues while cloning autopretty. This shouldn't be an actual problem but rather a random issue caused by its impurity and dependence on github.com.

Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, thanks!

@yajo yajo enabled auto-merge (squash) March 31, 2023 05:07
@yajo yajo merged commit 5295b9e into copier-org:master Mar 31, 2023
@sisp sisp deleted the fix/ignore-git-hooks branch March 31, 2023 05:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix conflict with commitizen (commit message format)
3 participants