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

Keep local changes before moving to a new branch optimization #637

Conversation

eranturgeman
Copy link
Contributor

@eranturgeman eranturgeman commented Feb 12, 2024

  • All tests passed. If this feature is not already covered by the tests, I added new tests.
  • This pull request is on the dev branch.
  • I used gofmt for formatting the code before submitting the pull request.

This PR implements an optimization for branch switching in Frogbot during the scan-and-fix flow. In scenarios where local changes are made in the cloned repository before opening a new 'fix' branch, it's essential to retain these changes in the newly opened branch. The transition process has been optimized for efficiency.

@eranturgeman eranturgeman requested a review from omerzi February 12, 2024 14:49
@eranturgeman eranturgeman added safe to test Approve running integration tests on a pull request ignore for release Automatically generated release notes labels Feb 12, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 12, 2024
@eranturgeman eranturgeman added the safe to test Approve running integration tests on a pull request label Feb 12, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 12, 2024
@eranturgeman eranturgeman added the safe to test Approve running integration tests on a pull request label Feb 13, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 13, 2024
@eranturgeman eranturgeman added the safe to test Approve running integration tests on a pull request label Feb 14, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 14, 2024
…l-changes-before-checkout-new-branch-optimization
@eranturgeman eranturgeman added the safe to test Approve running integration tests on a pull request label Feb 14, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 14, 2024
@eranturgeman eranturgeman added the safe to test Approve running integration tests on a pull request label Feb 14, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 14, 2024
scanrepository/scanrepository.go Outdated Show resolved Hide resolved
scanrepository/scanrepository.go Outdated Show resolved Hide resolved
utils/git_test.go Outdated Show resolved Hide resolved
@eranturgeman eranturgeman added the safe to test Approve running integration tests on a pull request label Feb 14, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 14, 2024
@eranturgeman eranturgeman added the safe to test Approve running integration tests on a pull request label Feb 15, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 15, 2024
…ckout-new-branch-optimization' into keep-local-changes-before-checkout-new-branch-optimization
@eranturgeman eranturgeman added the safe to test Approve running integration tests on a pull request label Feb 15, 2024
@github-actions github-actions bot removed the safe to test Approve running integration tests on a pull request label Feb 15, 2024
Copy link
Contributor

👍 Frogbot scanned this pull request and found that it did not add vulnerable dependencies.


@eranturgeman eranturgeman merged commit c5443c8 into jfrog:dev Feb 15, 2024
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ignore for release Automatically generated release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants