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 refspec instead of --prune-tags #529

Closed
wants to merge 2 commits into from

Conversation

edvbld
Copy link
Member

@edvbld edvbld commented Mar 23, 2020

Hi all,

please review this small patch that uses a refspec instead of --prune-tags for
GitRepository.fetchRemote. The flag --prune-tags was introduced in Git 2.17
and we want to support older Git versions, so I opted to use a refspec instead
to achieve the same effect.

Testing:

  • Manual testing of git sync 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/529/head:pull/529
$ git checkout pull/529

@bridgekeeper
Copy link

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

@mlbridge mlbridge bot commented Mar 23, 2020

Webrevs

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Mar 23, 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 refspec instead of --prune-tags

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 7 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 2b645bb39d61df4d2b2f276b5330caf19b81b213.

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

@openjdk openjdk bot added the ready label Mar 23, 2020
@edvbld
Copy link
Member Author

@edvbld edvbld commented Mar 23, 2020

/integrate

@openjdk openjdk bot closed this Mar 23, 2020
@openjdk openjdk bot added the integrated label Mar 23, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Mar 23, 2020

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

  • 2b645bb: 322: Improve error message on non-author /integrate
  • 1f08f7c: 325: Transient network errors can cause skipped notifications
  • f79bc7a: Ensure pull requests instances are populated with complete json info
  • d1ea8ca: cli: better hg support in git-jcheck
  • b79a80c: jcheck: check for bad whitespace in commit message
  • 8a8443e: jcheck: add symlink check
  • 019930b: 306: Automatic merge conflicts PR only have repo in title when needed

Your commit was automatically rebased without conflicts.

Pushed as commit b2b8de2.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 23, 2020

Mailing list message from Erik Helin on skara-dev:

Changeset: b2b8de2
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-03-23 08:06:30 +0000
URL: https://git.openjdk.java.net/skara/commit/b2b8de24

git-sync: use refspec instead of --prune-tags

Reviewed-by: rwestberg

! vcs/src/main/java/org/openjdk/skara/vcs/git/GitRepository.java

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