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.

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

git: remove --bare flag from git commands #5721

Merged
merged 1 commit into from
Feb 19, 2025
Merged

git: remove --bare flag from git commands #5721

merged 1 commit into from
Feb 19, 2025

Conversation

bsdinis
Copy link
Contributor

@bsdinis bsdinis commented Feb 16, 2025 •
edited
Loading

Fixes #5700

@martinvonz
Copy link
Member

git: don't rebase automatically after jj git fetch with subprocessing

This worried me until I looked at the commit messages :) I thought it was saying that we simply skip the usual rebasing after jj git fetch with subprocessing, but the fix is much more targeted. Good.

@bsdinis
Copy link
Contributor Author

bsdinis commented Feb 16, 2025 •
edited
Loading

Sorry, didn't mean to alarm. Maybe "git: don't unexpectedly rebase after an empty jj git fetch with subprocessing"?

@bsdinis bsdinis changed the title git: don't rebase automatically after jj git fetch with subprocessing git: fix unexpected rebase after empty jj git fetch with subprocessing Feb 16, 2025
@ilyagr
Copy link
Contributor

ilyagr commented Feb 18, 2025 •
edited
Loading

Thank you!

I'm not yet completely sure, but I think this PR helps immensely with concurrency mess I was getting when running CLI jj commands and VisualJJ at the same time. I thought that got much worse recently, but I didn't realize it had anything to do with using native Git.

I'm guessing that the update to fetch-HEAD caused either VisualJJ or VS Code to reload the repo, which caused and "import git refs" jj operation somehow.

@bsdinis
git: remove --bare flag from git commands
bddf7d7 
This causes some issues (e.g., #5700) and is not actively needed.
@bsdinis bsdinis force-pushed the bsdinis/rtyusmopotyw branch from b64ad68 to bddf7d7 Compare February 19, 2025 05:35
yuja
yuja reviewed Feb 19, 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.

I think we agree that removing --bare is least bad. Thanks for working on it.

@bsdinis bsdinis added this pull request to the merge queue Feb 19, 2025
@bsdinis bsdinis removed this pull request from the merge queue due to a manual request Feb 19, 2025
@bsdinis bsdinis changed the title git: fix unexpected rebase after empty jj git fetch with subprocessing git: remove --bare flag from git commands Feb 19, 2025
@bsdinis bsdinis added this pull request to the merge queue Feb 19, 2025
Merged via the queue into main with commit 6d26580 Feb 19, 2025
45 checks passed
@bsdinis bsdinis deleted the bsdinis/rtyusmopotyw branch February 19, 2025 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@martinvonz martinvonz martinvonz left review comments

@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.

Unexpected rebase after jj git fetch when git.subprocess=true
4 participants
@bsdinis @martinvonz @ilyagr @yuja