Only show available cherry picks - Githubissues

wfxr / forgit

:zzz: A utility tool powered by fzf for using git interactively.

MIT License

4.32k stars 136 forks source link

Only show available cherry picks #266

Closed cjappl closed 1 year ago

cjappl commented 1 year ago

Check list

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

Description

Fixes #264

Only shows changes that are eligible for cherry-pick to the branch, not every commit. Also adds nice color to the output

Steps to test:

Get two branches that have diverged (thisBranch and otherBranch
gcb thisBranch
gcp otherBranch

Expected:

Only the commits in "otherBranch" that DO NOT appear in "thisBranch" appear in the fzf window
If you cherry pick one of those commits, then gcp otherBranch again, it disappears from the fzf output (as it is successfully cherry-picked and not eligble for cherry-pick again.

Type of change

[x] New feature
[x] Refactor

Test environment

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

cjappl commented 1 year ago

I'm going to merge this soon unless I get any comments! Just pinging one more time @wfxr and @carlfriedrich

carlfriedrich commented 1 year ago

Sorry for the late reply, I am quite busy at the moment.

This works for me and I also find it useful, good work!