Skip to content

git: checkout.validate should set to branch only if both branch and hash are empty #1525

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

Jump to bottom
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

git: checkout.validate should set to branch only if both branch and hash are empty #1525

wants to merge 3 commits into from

Conversation

GaikwadPratik
Copy link

add validation usecase for Force and keep.

This would avoid the error condition where if Hash is provided on CheckoutOptions but NOT branch and validate is called since per documentation:

// Branch to be checked out, if Branch and Hash are empty is set to master.
Branch plumbing.ReferenceName

@GaikwadPratik
git: checkout.validate should set to branch only if both branch and h…
b91e7a7 
…ash are empty

add validation usecase for Force and keep
@GaikwadPratik GaikwadPratik mentioned this pull request Apr 19, 2025
Closed
pjbgf
pjbgf previously approved these changes Apr 26, 2025
View reviewed changes
Copy link
Member

@pjbgf pjbgf left a comment

Choose a reason for hiding this comment

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

@GaikwadPratik thanks for working on this. 🙇

@pjbgf pjbgf dismissed their stale review April 26, 2025 15:01

failing tests

@pjbgf
Copy link
Member

pjbgf commented Apr 26, 2025

@GaikwadPratik can you please take a look at the failing tests?

pjbgf
pjbgf reviewed Apr 26, 2025
View reviewed changes
pjbgf
pjbgf reviewed Apr 26, 2025
View reviewed changes
pjbgf
pjbgf reviewed Apr 26, 2025
View reviewed changes
@GaikwadPratik
Copy link
Author

GaikwadPratik commented Apr 26, 2025 •
edited
Loading

Hi @pjbgf , applied the suggestions, can you please trigger another pipeline? Is there a way to run make test-coverage locally? If I run that locally, even on main branch, I get a lot different errors.

@pjbgf
Copy link
Member

pjbgf commented Apr 27, 2025

@GaikwadPratik I generally run make test or rely on go test for specific tests I'm trying to run. Please note that some tests require git-daemon installed, without it you will get some errors.

@GaikwadPratik
Copy link
Author

@GaikwadPratik I generally run make test or rely on go test for specific tests I'm trying to run. Please note that some tests require git-daemon installed, without it you will get some errors.

Can we please update the documentation?

Also any idea why pipeline is failing even though my code doesn't touch those tests?

onee-only
onee-only reviewed Apr 27, 2025
View reviewed changes
Copy link
Contributor

@onee-only onee-only left a comment

Choose a reason for hiding this comment

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

FYI, this fails on my codespace too.

@GaikwadPratik
Copy link
Author

@pjbgf , okay my changes were breaking one of the test in worktree_test. Fixed the code conditions and tests for CheckoutOptions as well by keeping them simple and to the basics. Ran make test locally and they ran successfully.

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pjbgf pjbgf pjbgf left review comments

@onee-only onee-only onee-only left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@GaikwadPratik @pjbgf @onee-only