sbt-git icon indicating copy to clipboard operation
sbt-git copied to clipboard

Automatic worktree detection

Open steinybot opened this issue 1 year ago • 6 comments

It's a pain submitting PRs to all the repositories that use sbt-git when I want to use a git worktree. This should eliminate the need for that.

Related issues:

  • https://github.com/sbt/sbt-git/issues/110
  • https://github.com/sbt/sbt-git/issues/160

steinybot avatar Jun 12 '24 11:06 steinybot

@SethTisue appologies for mentioning you directly but I noticed in https://github.com/sbt/sbt-git/pull/248 you were planning on doing a release soon. Any chance of getting this in too? It's a bit of a pain having to workaround it in each project that uses sbt-git.

steinybot avatar Sep 08 '24 23:09 steinybot

@eed3si9n @adpi2 would either of you like to take a look at this? I don't have any insight into Jason's questions above about the code tails.

if we don't hear back, I'd be happy to optimistically merge this anyway

SethTisue avatar Sep 18 '24 18:09 SethTisue

re: publishing, I've opened #253

SethTisue avatar Sep 18 '24 18:09 SethTisue

If you haven't heard yet:

  • JGit 7 released with worktrees read support
    • https://projects.eclipse.org/projects/technology.jgit/releases/7.0.0
    • Requires Java 17 however...
  • https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1194900
  • https://github.com/eclipse-jgit/jgit/commit/f9beeb3b33e438fa3a10eb3871206573ae986abb

mkurz avatar Oct 07 '24 19:10 mkurz

@steinybot mind rebasing? also, does @mkurz's info affect this, or is just evidence for urgency?

SethTisue avatar Oct 10 '24 21:10 SethTisue

fyi, the current Play main branch drops support for Java 11, so we just upgrade jgit ourselves to avoid all those workarounds in future (I think it will take years until sbt-git will drop Java 11...):

  • https://github.com/playframework/playframework/pull/12910

Tested locally and can confirm it works.

mkurz avatar Oct 16 '24 13:10 mkurz