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

revset: drop support for HEAD@git symbol resolution #4632

Merged
merged 2 commits into from
Oct 21, 2024

Conversation

yuja
Copy link
Collaborator

@yuja yuja commented Oct 13, 2024

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

CHANGELOG.md Outdated Show resolved Hide resolved
yuja added 2 commits October 21, 2024 09:05
This was added at f5f61f6 "revset: resolve 'HEAD@git' just like other
pseudo @git branches." As I said in this patch, there was no practical use case
of the HEAD@git symbol.

Suppose we implement colocated workspaces/worktrees jj-vcs#4436, there may be multiple
Git HEAD revisions. This means HEAD can no longer be abstracted as a symbol of
the "git" remote.
For the same reason as the root revision is indicated by "root()".
@yuja yuja force-pushed the push-xkzzslsymrqw branch from f64cb1f to f5946c1 Compare October 21, 2024 00:09
@yuja yuja enabled auto-merge (rebase) October 21, 2024 00:12
@yuja yuja merged commit 5dd6185 into jj-vcs:main Oct 21, 2024
18 checks passed
@yuja yuja deleted the push-xkzzslsymrqw branch October 21, 2024 00:21
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.

3 participants