Skip to content

cli/tests: move test_git_colocated to gitoxide #5803

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
Merged
merged 3 commits into from
Mar 1, 2025
Merged

cli/tests: move test_git_colocated to gitoxide #5803

merged 3 commits into from
Mar 1, 2025

Conversation

bsdinis
Copy link
Contributor

@bsdinis bsdinis commented Feb 25, 2025

As per #5548

@bsdinis
Copy link
Contributor Author

bsdinis commented Feb 25, 2025

There are a couple of notes/questions I have with this:

  • In the second commit, using gitoxide changes what jj considers to be mutable in the cloned repo. Not sure what to make of this, maybe it's something to do with the default branch?
  • I've isolated the third commit with the most complex test (involves the index)

Both commits should be squashed before merging

yuja
yuja reviewed Feb 25, 2025
View reviewed changes
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

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

Both commits should be squashed before merging

I like the current state because the last patch is complex. I think the first two patches could be squashed if you like.

@bsdinis bsdinis force-pushed the bsdinis/rrxkmmrvwrpu branch 12 times, most recently from 3a6b698 to 69e0524 Compare February 28, 2025 07:34
yuja
yuja reviewed Feb 28, 2025
View reviewed changes
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

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

The first two patches look good, thanks.

@bsdinis bsdinis force-pushed the bsdinis/rrxkmmrvwrpu branch from 69e0524 to 14cc4da Compare February 28, 2025 19:10
@bsdinis bsdinis force-pushed the bsdinis/rrxkmmrvwrpu branch from 14cc4da to c8bbe05 Compare March 1, 2025 05:34
yuja
yuja approved these changes Mar 1, 2025
View reviewed changes
Copy link
Contributor

@yuja yuja left a comment

Choose a reason for hiding this comment

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

Thanks.

@bsdinis bsdinis force-pushed the bsdinis/rrxkmmrvwrpu branch from c8bbe05 to 52ff4d8 Compare March 1, 2025 09:40
@bsdinis bsdinis enabled auto-merge March 1, 2025 09:40
@bsdinis bsdinis added this pull request to the merge queue Mar 1, 2025
Merged via the queue into main with commit 038da96 Mar 1, 2025
45 checks passed
@bsdinis bsdinis deleted the bsdinis/rrxkmmrvwrpu branch March 1, 2025 10:09
@bsdinis bsdinis mentioned this pull request Feb 21, 2025
Closed
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuja yuja yuja approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@bsdinis @yuja