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.

Sign up for GitHub

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

Jump to bottom

Update jgit #487

Closed
slarse opened this issue Jan 29, 2024 · 1 comment · Fixed by #509
Closed

Update jgit #487

slarse opened this issue Jan 29, 2024 · 1 comment · Fixed by #509
Labels
dependencies Pull requests that update a dependency file help wanted Extra attention is needed

Comments

@slarse
Copy link
Collaborator

slarse commented Jan 29, 2024

Later versions of jgit break certain test cases in Spork, conflict resolution in particular.

jgit is currently ignored by Dependabot (see #485 (comment)), so when this is resolved a @dependabot unignore command must be issued for jgit.
@slarse slarse added help wanted Extra attention is needed dependencies Pull requests that update a dependency file labels Jan 29, 2024
@wetneb
Copy link
Contributor

wetneb commented Apr 6, 2024

I might have a go at this since it's blocking for #496.

wetneb added a commit to wetneb/spork that referenced this issue Apr 6, 2024
@wetneb
Upgrade jgit to 6.9.0.202403050737-r
c86a2e2 
Fixes ASSERT-KTH#487.
@wetneb wetneb mentioned this issue Apr 6, 2024
Merged
wetneb added a commit to wetneb/spork that referenced this issue Apr 6, 2024
@wetneb
Upgrade jgit to 6.9.0.202403050737-r
00ca473 
Fixes ASSERT-KTH#487.
slarse pushed a commit that referenced this issue Apr 7, 2024
@wetneb
[misc] Upgrade jgit to 6.9.0.202403050737-r (#509)
00a8ec7 
* Upgrade jgit to 6.9.0.202403050737-r

Fixes #487.

* Remove LineBasedMergeTest
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file help wanted Extra attention is needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Upgrade jgit to 6.9.0.202403050737-r wetneb/spork
2 participants
@wetneb @slarse