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

git: commitMetadata should return commits in topo order #727

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Aug 21, 2020

Hi all,

please review this small patch that makes GitRepository.commitMetadata return commits topological order (i.e. all parents first, then the parent). This is already done by GitRepository.commits.

Testing:

  • make test passes on Linux x64
  • Did not add a new unit test since it is hard to force commits to be returned in non-topological order

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/727/head:pull/727
$ git checkout pull/727

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 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 Aug 21, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 21, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Aug 21, 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:

git: commitMetadata should return commits in topo order

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.

Since the source branch of this PR was last updated there have been 4 commits pushed to the master branch:

  • becfd45: git: allow diffs against initial revision
  • 3916cb7: hg: implement hashes for blobs for ls-tree
  • 1dbd418: mlbridge: use consistent conf for webrevs
  • edb4d04: build: update to JDK 14.0.2

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate becfd455f7ed1952a35023e91a6ad966ba3d8fa0.

➡️ 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 Aug 21, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Aug 21, 2020

/integrate

@openjdk openjdk bot closed this Aug 21, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Aug 21, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Aug 21, 2020

@edvbld The following commits have been pushed to master since your change was applied:

  • becfd45: git: allow diffs against initial revision
  • 3916cb7: hg: implement hashes for blobs for ls-tree
  • 1dbd418: mlbridge: use consistent conf for webrevs
  • edb4d04: build: update to JDK 14.0.2

Your commit was automatically rebased without conflicts.

Pushed as commit 4175a74.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants