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

remove redundant workaround for unborn branch on "git clone --colocate" #2391

Merged
merged 2 commits into from
Oct 17, 2023

Conversation

yuja
Copy link
Contributor

@yuja yuja commented Oct 17, 2023

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added tests to cover my changes

yuja added 2 commits October 17, 2023 13:41
…locate"

Apparently, 0fe2557 "cli: ensure first new HEAD is detached" is more
general solution to the problem. The test added at 8b5ff20 passes.
@yuja yuja enabled auto-merge (rebase) October 17, 2023 04:43
Copy link
Member

@martinvonz martinvonz left a comment

Choose a reason for hiding this comment

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

The second commit seems quite unrelated, and I wonder if you even meant to include it in this PR. It seems like a reasonable change to make, however, so I don't object.

@yuja yuja merged commit 940e243 into jj-vcs:main Oct 17, 2023
14 checks passed
@yuja yuja deleted the push-mmpmpusvyvoz branch October 17, 2023 05:13
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.

2 participants