Improve cherry-pick

[carlfriedrich]

This PR improves gcp (cherry-pick) with the following features:

1. Add FORGIT_CHERRY_PICK_FZF_OPTS The gcp command was the only command which did not have a variable to set command-specific fzf options. Add the according variable to source code and documentation.

2. Preserve commit order on cherry pick When using a fzf find string which maches multiple lines, the commits could appear in a wrong order. Add --tiebreak=index to ensure that the correct commit order is preserved.

3. Preserve +/- information on cherry pick The output of git cherry which is used to build the fzf input list for forgit::cherry::pick usually prefixes every line with a '-' for commits that have an equivalent in the target branch, and a '+' for commits that do not. Previously forgit removed this information from the list. However, for the actual cherry-picking process this information is relevant, so we should keep it.

4. Reverse order on cherry pick glo displays the newest commits on top of the list, while gcp displays the newest commits at the bottom. Reverse the order of gcp so that it has the same order like glo.

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

Type of change

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

Test environment

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

[cjappl]

Love the improvements, just want to understand if we can replicate what tac does in a command that is available on both linux and mac!

[cjappl]

How about tail -r instead? Seems to work on my machine.

$ echo "hi
              hello
              world" | tail -r
world
hello
hi
$ echo "hi
              hello
              world" | /bin/cat
hi
hello
world

[wfxr]

@carlfriedrich Unfortunately gnu tail (on linux) doesn't support -r option.

❯ seq 10 | tail -r
tail: invalid option -- 'r'
Try 'tail --help' for more information.

[carlfriedrich]

Hi @cjappl and @wfxr, thanks for your feedback. I have replaced tac with a combination of tac and tail -r, like proposed in this StackOverflow answer. Tested with bash and fish. Are you okay with that?

The alternative would be using sed or awk, but both would be significantly slower, which might make a difference on huge repos.

[cjappl]

Looks reasonable enough to me! will leave it to @wfxr to approve officially. Thanks for the adjustment