Provide an input branch with gcp again

[cjappl]

Noticed there was a change recently that broke the ability to pass in an input branch to gcp.

This change is the following:

• Fix faulty logic that just led to a git checkout -b being called when you pass in an argument to gcp
• If an argument was passed in, check if it is a valid branch, if so, set the input_branch var
• If input_branch is set, use it to do the cherry pick, as opposed to the first FZF selection.

PLEASE HELP ME REVIEW THIS, @carlfriedrich and @wfxr. I am such a bash syntax newbie, I don't know if I'm writing bad code 😄

Check list

• [x] I have performed a self-review of my code
• [ ] I have commented my code in hard-to-understand areas
• [ ] I have made corresponding changes to the documentation

Description

Type of change

• [x] Bug fix
• [ ] New feature
• [ ] Refactor
• [ ] Breaking change
• [ ] Documentation change

Test environment

• Shell
  • [x] bash
  • [x] zsh
  • [x] fish
• OS
  • [ ] Linux
  • [x] Mac OS X
  • [ ] Windows
  • [ ] Others:

[cjappl]

also, if someone could pull this down and test it on their machine, that would also be great. Again, very new with bash syntax so I want to get used to it, but I'm nervous about mistakes :)

[cjappl]

Test cases:

In a repo with a main branch and a feature branch:

1. Checkout feature
2. gcp main - should result in a list of commits from main, you should be able to tab select the commits to cherry pick them
3. gcp - should come up with a list of all the branches in the repo. selecting one of them will bring up a list of commits from that branch
4. gcp someBranchThatDoesntExist should behave like 3, just ignore the bad input (should we error out here??)

[carlfriedrich]

@cjappl Thanks for your patch. I actually don't know why the heck I have added this git checkout line?! I will take a look into this in the next days. :-)

[cjappl]

Thanks!! Appreciate it :)

On Mon, Nov 28, 2022 at 1:24 AM, Tim @.***> wrote:

@.***(https://github.com/cjappl) Thanks for your patch. I actually don't know why the heck I have added this git checkout line?! I will take a look into this in the next days. :-)

— Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you were mentioned.Message ID: @.***>

[cjappl]

Great suggestions @carlfriedrich ! Let me know if that fixes those up. I have tested and confirmed the functionality still works as intended. Now with less annoying "stuck in the loop" when you give an input branch. Definitely a good improvement.

[cjappl]

Sounds good @carlfriedrich ! Will "Squash and Merge" do what you're wanting? That's what I usually do anyway. when I submit.

[carlfriedrich]

@cjappl Yep, that's fine! The new commit message for the squash commit will appear in the changelog then.