Skip to content

Conversation

@jerry-skydio
Copy link
Collaborator

Cherry-pick was updated to fetch if the branch doesn't
exist, but this could fetch unnecessarily if the remote
branch exists locally but namespaced in the remote.

Make this more clear with 3 paths:

  • branch exists locally
  • branch doesn't exist but remote version of it does (no fetch needed)
  • neither of the above exists, will attempt to fetch

Cherry-pick was updated to fetch if the branch doesn't
exist, but this could fetch unnecessarily if the remote
branch exists locally but namespaced in the remote.

Make this more clear with 3 paths:
- branch exists locally
- branch doesn't exist but remote version of it does (no fetch needed)
- neither of the above exists, will attempt to fetch
@jerry-skydio
Copy link
Collaborator Author

Reviews in this chain:
#169 cherry-pick: Only fetch if remote branch doesn't exist

@jerry-skydio
Copy link
Collaborator Author

jerry-skydio commented Mar 13, 2024

# head base diff date summary
0 2262b049 c4ace457 diff Mar 13 14:51 PM 1 file changed, 15 insertions(+), 9 deletions(-)
1 5547b895 c4ace457 diff Mar 13 14:52 PM 1 file changed, 1 insertion(+), 1 deletion(-)

Copy link
Contributor

@aaron-skydio aaron-skydio left a comment

Choose a reason for hiding this comment

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

Does this work to repeatedly cherry-pick the same branch and get the new version each time? I do that a lot

@jerry-skydio
Copy link
Collaborator Author

no 😞 i'll think about this some more since I agree its objectively more important to be able to pick up changes vs saving ~.5s

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.

3 participants