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

Add config option for git-sync --pull #260

Closed
wants to merge 1 commit into from

Conversation

@edvbld
Copy link
Member

edvbld commented Nov 20, 2019

Hi all,

please review this small patch that enables configuring git sync to always pull the active branch (via the sync.pull configuration). If sync.pull is set to always, for example via git config sync.pull always then git sync will always try to pull the active branch after a successful sync.

Thanks,
Erik

Testing

  • Manual testing of git sync with and without configuration setting

Progress

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

Approvers

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 20, 2019

👋 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 (refresh this page to view it).

@openjdk openjdk bot added rfr cli labels Nov 20, 2019
@mlbridge
Copy link

mlbridge bot commented Nov 20, 2019

Webrevs

Copy link
Member

rwestberg left a comment

Looks good! There is a test failure on mac, but it seems unrelated, so can perhaps be investigated separately.

@openjdk openjdk bot removed the rfr label Nov 20, 2019
@openjdk
Copy link

openjdk bot commented Nov 20, 2019

@edvbld This change can now be integrated. The commit message will be:

Add config option for git-sync --pull

Reviewed-by: rwestberg
  • If you would like to add a summary, use the /summary command.
  • To list additional contributors, use the /contributor command.
  • To integrate this PR with the above commit message, type /integrate in a new comment.
@openjdk openjdk bot added the ready label Nov 20, 2019
@edvbld
Copy link
Member Author

edvbld commented Nov 21, 2019

Yeah, the macOS test failure is not because of this change. I agree we can integrate this patch and follow up on test failure later.

@edvbld
Copy link
Member Author

edvbld commented Nov 21, 2019

/integrate

@openjdk openjdk bot closed this Nov 21, 2019
@openjdk openjdk bot added integrated and removed ready labels Nov 21, 2019
@openjdk
Copy link

openjdk bot commented Nov 21, 2019

@edvbld
Pushed as commit 1a8ea84.

@mlbridge
Copy link

mlbridge bot commented Nov 21, 2019

Mailing list message from Erik Helin on skara-dev:

Changeset: 1a8ea84
Author: Erik Helin
Date: 2019-11-21 08:45:05 +0000
URL: https://git.openjdk.java.net/skara/commit/1a8ea845

Add config option for git-sync --pull

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
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.