Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork4.1k
jgit upgrade to support git worktree#12910
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
mkurz wants to merge3 commits intoplayframework:mainChoose a base branch frommkurz:jgit-upgrade_support_git-worktree
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Open
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
mkurz commentedOct 16, 2024
@@ -0,0 +1 @@ | |||
addDependencyTreePlugin |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Ah yeah I added this so I can rundependencyBrowseTreeHTML
in the meta-build. IMHO adding it to the meta-build does not hurt.
3c079d4
toc6cb97b
CompareWaiting for a reply in to see if we need to set ThisBuild/ com.github.sbt.git.SbtGit.GitKeys.useConsoleForROGit:=false in |
Allows us to run dependencyBrowseTreeHTML in meta-build (reload plugins)
c6cb97b
to25556a9
CompareSign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The comment in the diff explains everything.
See
Personally I make use of git worktree, I checked out the 3.0.x and and 2.9.x in separate folders. Until now I had to make a workaround by setting
ThisBuild / com.github.sbt.git.SbtGit.GitKeys.gitUncommittedChanges := false
otherwise sbt wont start up the project and you run into following exception:Exception with jgit 5 (and 6) (click to expand)
sbt-git introduced a setting (
useReadableConsoleGit
) to avoid using jgit and fall back to command line git:Also they want to soon detect if a project is checked out in a linked worktree or not and only disable jgit if you are:
However, if we just ugprade to jgit 7+ we can avoid all of that because it supports git worktree out of the box.
One of those small things that makes development just smoother out of the box...