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

[ZEPPELIN-6125] Enable updates on the same branch using dev/checkout_zeppelin_pr.sh #4870

Merged
merged 1 commit into from
Oct 7, 2024

Conversation

tbonelee
Copy link
Contributor

@tbonelee tbonelee commented Oct 6, 2024

(Reopening to link this github PR issues to the jira issue)

What is this PR for?

The dev/checkout_zeppelin_pr.sh script is useful for locally checking out PR commits.

Currently, it fetches the PR and checks out a new branch.

However, if the script is run while already on the target branch, the updates are not reflected because git checkout does not move the HEAD when the current branch is already checked out.

To resolve this, the script has been updated to use git pull instead when the current branch is already checked out.

What type of PR is it?

Improvement

What is the Jira issue?

How should this be tested?

  • Strongly recommended: add automated unit tests for any new or changed behavior
  • Outline any manual steps to test the PR here.

Screenshots (if appropriate)

Questions:

  • Does the license files need to update? No
  • Is there breaking changes for older versions? No
  • Does this needs documentation? No

Copy link
Member

@pan3793 pan3793 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sense

@pan3793 pan3793 merged commit 45c981b into apache:master Oct 7, 2024
26 of 28 checks passed
pan3793 pushed a commit that referenced this pull request Oct 7, 2024
…zeppelin_pr.sh

(Reopening to link this github PR issues to the jira issue)

### What is this PR for?
The `dev/checkout_zeppelin_pr.sh` script is useful for locally checking out PR commits.

Currently, it fetches the PR and checks out a new branch.

However, if the script is run while already on the target branch, the updates are not reflected because `git checkout` does not move the `HEAD` when the current branch is already checked out.

To resolve this, the script has been updated to use `git pull` instead when the current branch is already checked out.

### What type of PR is it?
Improvement

### What is the Jira issue?
* Open an issue on Jira https://issues.apache.org/jira/browse/ZEPPELIN-6125
* Put link here, and add [ZEPPELIN-*Jira number*] in PR title, eg. [ZEPPELIN-533]

### How should this be tested?
* Strongly recommended: add automated unit tests for any new or changed behavior
* Outline any manual steps to test the PR here.

### Screenshots (if appropriate)

### Questions:
* Does the license files need to update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Closes #4870 from tbonelee/enhance-checkout-script.

Signed-off-by: Cheng Pan <[email protected]>
(cherry picked from commit 45c981b)
Signed-off-by: Cheng Pan <[email protected]>
@tbonelee tbonelee deleted the enhance-checkout-script branch November 9, 2024 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants