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

vcs: proper source paths for merge commits #675

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jun 21, 2020

Hi all,

please review this patch that fixes an issue with parsing Git merge commits. Without the --combined-all-paths the "RAW" diff format of git diff --combined will only print the resulting (target) path for a rename. This mean that patch.source().path() would Optional.empty() for such a patch. This patch fixes this by passing the --combined-all-paths flag to git log and updating the GitCombinedDiffParser.

Testing:

  • Added a new unit test
  • make test passes on Linux x64

Thanks,
Erik


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/675/head:pull/675
$ git checkout pull/675

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 21, 2020

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@openjdk openjdk bot added the rfr label Jun 21, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 21, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Jun 22, 2020

@edvbld This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

vcs: proper source paths for merge commits

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

There are currently no new commits on the master branch since the last update of the source branch of this PR. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you would like to avoid potential automatic rebasing, specify the current head hash when integrating, like this: /integrate 9f5bf30ef5c5e4333babc17285f6f2a1688443a3.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jun 22, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Jun 22, 2020

/integrate

@openjdk openjdk bot closed this Jun 22, 2020
@openjdk openjdk bot added integrated and removed ready labels Jun 22, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Jun 22, 2020

@edvbld
Pushed as commit 7f84ac8.

@openjdk openjdk bot removed the rfr label Jun 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants