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
50: Fix failing tests after e8d32c78dc #39
Conversation
|
Webrevs
|
Looks good, some minor comment change suggestions (one pre-existing).
vcs/src/main/java/org/openjdk/skara/vcs/git/GitCombinedDiffParser.java
Outdated
Show resolved
Hide resolved
@edvbld This change can now be integrated. The commit message will be:
Since the source branch of this PR was last updated there have been 2 commits pushed to the Since there are no conflicts, your changes will automatically be rebased on top of the above commits when integrating. If you prefer to do this manually, please merge
|
Co-Authored-By: Robin Westberg <robin@westberg.se>
Thanks @rwestberg for the comments! |
/integrate |
Hi all,
this patch fixes some test failures after e8d32c7 was integrated. Turns out there are different bugs in git with regards to unified diffs with zero context😢 @JornVernee fixed the issues with the regular unified diff printer (when there is exactly one parent), this patch works around the issues with git's combined diff printer. The combined diff printer seems to print correct start for empty hunks as long as the file the hunks belong to isn't added.
I also updated a number of tests to take the changes in e8d32c7 into account.
Testing
sh gradlew test
on Linux x86-64Progress
Approvers