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: warn user about old version of git when using mergetool #3637

Merged
merged 3 commits into from Oct 17, 2023

Conversation

Panaetius
Copy link
Member

closes #3617

I could not reproduce this but found indications that it can be due to old git versions, so I added a custom message to the user that they should update their git version

@coveralls
Copy link
Collaborator

coveralls commented Oct 10, 2023

Pull Request Test Coverage Report for Build 6543815144

  • 1 of 4 (25.0%) changed or added relevant lines in 1 file are covered.
  • 4 unchanged lines in 4 files lost coverage.
  • Overall coverage increased (+0.03%) to 86.193%

Changes Missing Coverage Covered Lines Changed/Added Lines %
renku/infrastructure/git_merger.py 1 4 25.0%
Files with Coverage Reduction New Missed Lines %
renku/core/dataset/providers/dataverse.py 1 88.86%
renku/core/migration/m_0003__1_jsonld.py 1 87.68%
renku/ui/cli/init.py 1 96.9%
renku/ui/cli/service.py 1 28.57%
Totals Coverage Status
Change from base Build 6531119269: 0.03%
Covered Lines: 26462
Relevant Lines: 30701

💛 - Coveralls

renku/infrastructure/git_merger.py Outdated Show resolved Hide resolved
@Panaetius Panaetius enabled auto-merge (squash) October 17, 2023 07:17
@Panaetius Panaetius merged commit 5df0ce1 into develop Oct 17, 2023
24 of 27 checks passed
@Panaetius Panaetius deleted the fix/worktree-sparse-checkout branch October 17, 2023 07:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

git merge tool fails with sparse checkout
3 participants