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-sync: use ref names instead of hashes #408

Closed
wants to merge 1 commit into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Feb 7, 2020

Hi all,

please review this small patch that makes git sync avoid using SHA-1 hashes
when executing git fetch. There was nothing wrong with this approach, but
older git clients have problems when the ref to fetch is a SHA-1 hash. There
is no drawback in using the ref name instead, it only increases compatibility
with older git clients.

Thanks,
Erik

Progress

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

Approvers

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 7, 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.

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Feb 7, 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-sync: use ref names instead of hashes

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 /solves command.

Since the source branch of this PR was last updated there have been 3 commits pushed to the master branch. Since 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 9958c7e4d061b3629a53c54a5f966a6645591e28.

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

@openjdk openjdk bot added the ready label Feb 7, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 7, 2020

Webrevs

@edvbld
Copy link
Member Author

@edvbld edvbld commented Feb 7, 2020

/integrate

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

@openjdk openjdk bot commented Feb 7, 2020

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

  • 19f5473: merge-bot: clearer merge messages when merging between repos
  • b5f9228: Avoid running the mailing list bridge too often

Your commit was automatically rebased without conflicts.

Pushed as commit 9958c7e.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 7, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: 9958c7e
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-02-07 07:43:35 +0000
URL: https://git.openjdk.java.net/skara/commit/9958c7e4

git-sync: use ref names instead of hashes

Reviewed-by: rwestberg

! cli/src/main/java/org/openjdk/skara/cli/GitSync.java

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