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: handle lightweight tags in Git #670

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Jun 17, 2020

Hi all,

please review this patch that makes GitRepository.annotate handle lightweight tags gracefully.

Testing:

  • Added a 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/670/head:pull/670
$ git checkout pull/670

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jun 17, 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 17, 2020
Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Jun 17, 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: handle lightweight tags in Git

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 3 commits pushed to the master branch:

  • ca39c57: 419: /issue add should allow project names in lower case
  • 1f6b323: 423: Avoid combining messages with different subjects
  • 3431a9e: 427: Allow bridging PR updates to multiple recipients

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 ca39c57bf150c55fce30c74e2756b7afb0aa0645.

➡️ 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 17, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jun 17, 2020

Webrevs

@edvbld
Copy link
Member Author

@edvbld edvbld commented Jun 17, 2020

/integrate

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

@openjdk openjdk bot commented Jun 17, 2020

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

  • ca39c57: 419: /issue add should allow project names in lower case
  • 1f6b323: 423: Avoid combining messages with different subjects
  • 3431a9e: 427: Allow bridging PR updates to multiple recipients

Your commit was automatically rebased without conflicts.

Pushed as commit 28456f5.

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