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

Workaround to allow usage within git worktrees. fixes #110 #168

Merged
merged 1 commit into from
Mar 15, 2022

Conversation

hughsimpson
Copy link
Contributor

@hughsimpson hughsimpson commented Jun 11, 2019

Adds a useConsoleForROGit setting and useReadableConsoleGit util, so that the plugin can be used with worktrees
Usage:

import com.typesafe.sbt.SbtGit._
useReadableConsoleGit

@hughsimpson hughsimpson changed the title #110 #110 Workaround to allow usage within git worktrees Jun 11, 2019
@hughsimpson hughsimpson changed the title #110 Workaround to allow usage within git worktrees Workaround to allow usage within git worktrees. fixes #110 Jun 12, 2019
@blast-hardcheese
Copy link
Contributor

https://stackoverflow.com/a/49363242 seems as though there's a different strategy, using Git.open instead, no need for a workaround

@grollinger
Copy link

I've long been annoyed by this limitation of JGit and the inability to switch off JGit completely in sbt-git.

What's missing for us to make progress on this MR?
I'd be willing to help if I can.

@raboof
Copy link
Collaborator

raboof commented Oct 7, 2021

Very frustrating indeed. The issue to support worktrees in jgit is https://bugs.eclipse.org/bugs/show_bug.cgi?id=477475

@armanbilge
Copy link

We're bumping into this too over in typelevel/sbt-typelevel. I'd prefer to see an upstream fix rather than hack it in our plugin, but I understand if that's also the case here :)

Is there something that would help get this PR merged, or is it effectively a won't -fix? Thanks!

@SethTisue
Copy link
Member

SethTisue commented Mar 7, 2022

I don't think anyone really "owns" the code in this repo anymore.

I'm happy to merge the PR if people want it (using my sbt/* admin rights, which I can't afford to spend too much time exercising in too many different repos...)

...but I'd like to have some indication that the actual changes have been reviewed to the best of our collective abilities.

@SethTisue
Copy link
Member

SethTisue commented Mar 7, 2022

Does anyone have any response to @blast-hardcheese's question? Are y'all confident this PR is needed?

@armanbilge
Copy link

Thank you so much for the response! Pinging @djspiewak as he's the one that flagged up these issues to me.

@djspiewak
Copy link
Contributor

@SethTisue This is definitely still needed.

JGit breaks a lot more than just worktrees, though that's certainly the most visible scenario. I've also seen situations where .gitignores that use more complex semantics aren't properly respected, and also nearly everything involving submodules doesn't work quite how it should. This PR would literally fix most of what's broken about sbt-git right now, to the point where I would almost advocate going further and defaulting the setting to true.

@blast-hardcheese
Copy link
Contributor

Wholeheartedly agree. Bikeshedding the solution is not as important as having a solution, I'm fully onboard with whatever works.

@armanbilge
Copy link

@SethTisue would you feel okay to move ahead with this? Or should we give a chance for someone else to chime in. Thanks! :)

@SethTisue
Copy link
Member

I'll merge on Monday or Tuesday if there's no further feedback by then.

@SethTisue SethTisue merged commit ae227f6 into sbt:main Mar 15, 2022
@SethTisue
Copy link
Member

As for releasing this, seeking volunteer assistance on #215

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.

7 participants