The way to set up alias is seem very unconventional, is there a reason to not use the alias command instead ?

forgit_log=glo
forgit_diff=gd
forgit_add=ga
forgit_reset_head=grh
forgit_ignore=gi
forgit_restore=gcf
forgit_clean=gclean
forgit_stash_show=gss

alias glo='forgit::log'
alias gd='forgit::diff'
alias ga='forgit::add'
alias grh='forgit::reset_head'
alias gi='forgit::ignore'
alias gcf='forgit::restore'
alias gclean='forgit::clean'
alias gss='forgit::stash_show'

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

Related with issue #29 and #39
There is now preview when you are in a subdirectory.
After searching where the solution for #29 changed, I found it was removed in PR #58.

It this the expected behavior? Am I missing something?

Hi, on an up to date Void Linux system, fish, version 3.0.2
using "source ~/.config/forgit/forgit.plugin.fish" in ~/.config/fish/config.fish

I get

~/.config/forgit/forgit.plugin.fish (ligne 16) :
if not hash fzf > /dev/null 2>&1
^
du fichier source /.config/forgit/forgit.plugin.fish
appelé à la ligne 331 du fichier '/.config/fish/config.fish'

du fichier source ~/.config/fish/config.fish
appelé pendant le démarrage

~/.config/forgit/forgit.plugin.fish (ligne 32) :
hash emojify >/dev/null 2>&1 && set forgit_emojify '|emojify'
^
du fichier source /.config/forgit/forgit.plugin.fish
appelé à la ligne 331 du fichier '/.config/fish/config.fish'

du fichier source ~/.config/fish/config.fish
appelé pendant le démarrage

Indeed hash is not a builtin command and does not exist otherwise in my system

Thanks

There is no necessary to a show the option list since one can easily do redirect by self, eg gi > .gitignore, gi rust >> .gitignore.

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

I added source (curl -sSL git.io/forgit.fish | psub) to my fish config file and trying the commands to explore forgit. When I try command ga, I get the below error.

The other commands are working fine.

Hi,

Thank you for making this tool!

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

1. Create a new file named foo that contains hello
2. Type ga
3. The file foo appears in the list but the preview for it is empty, it does not show hello

It would be nice to have this because once I type ga and see a new untracked file I can decide whether I need to add it or ignore it in .gitignore.

I can see why this can be an issue: What would be the expected behaviour when adding a new untracked folder? Maybe ga should list all the untracked files and not just their parent directory?

Could we change this so that it will use $XDG_CONFIG_HOME if it's set and otherwise use the home directory?

Thanks for a great program!

Any way support could be added for viewing stashes? Currently I hate viewing stashes in SourceTree, and git's cli is suboptimal for it.

Environment info

• OS
  • Linux
• Shell
  • zsh

Problem / Steps to reproduce

glo first_ref..last_ref

e.g.: glo 188a849b..73e5ca0d

Expected behavior:

Shows the commits only including that slice, and each diff is separate.

Actual behavior:

Shows the commits only including that slice, but if you hover over any of them, it shows the diff of the whole slice itself, not each separate commit.

First, thanks for this awesome tool! I just discovered it and already wished to have used it for the past months!

However the ga which is correctly setup as which ga shows that it's the forgit function does not trigger/show anything. It seems to either return or swallow an error.

Any idea on if that's a problem with ga itself or how I can debug more?

Thanks!

Hi,
Thank you for this awesome plugin.
But one question, while I select a stash, is there any way to delete it? like a keybinding or so?

Thanks

The current command format forgit::command arg is pretty odd, and doesnt accept options such as --help

Using an universal format like forgit [--option] <command> [<args>] and a standard gnu help could be a great addition for completion systems (so compdef _gnu_generic forgit could work, also we could use git completion to select branch and files)

https://www.gnu.org/prep/standards/html_node/Command_002dLine-Interfaces.html

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

The git log viewer calls git log --graph. Because the commits are shown bottom-up, the graph edges point the wrong way. See for example the log of forgit itself:

I don't think it is possible to have git output a reverse graph (--graph and --reverse are mutually exclusive). Maybe --graph should be omitted from the git log command?

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

I just have pulled the latest repository and tried ga. This is the output:

Not sure where's this coming from. Any ideas?

Just getting in to FZF and found this! It looks killer.

Any chance of supporting fish in the future? I'm sure it'd unlock even more users!

Hello
I've noticed that zsh is supported. Are there plans to support fish shell, too?

Hello there,

Would be possible to have a shortcut (like Ctrl-E or even customize Tab?) that would open an highlighted file?
After looking at a diff, I would like to hack the file without going further steps.

Just wondering if there is a reason it's ctrl+r, I think ctrl+a is a little more common, and may be more intuitive

set FORGIT_FZF_DEFAULT_OPTS "
$FZF_DEFAULT_OPTS
--ansi
...
--bind='ctrl-r:toggle-all'    <------
...
$FORGIT_FZF_DEFAULT_OPTS
"

forgit should be able to use whatever program is specified by the git config core.pager.

I use delta as my git pager, and I work around the lack of support in forgit quite well by adding a faux diff-so-fancy shell script to my path that calls delta.

Hi,

Since git clean does not currently have inclusion filter, is there any chance you might add some convenient helpers for git clean? :)

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

Would be nice to have a git status view similar to the https://github.com/timbrel/GitSavvy one (see screenshot) that allows to quickly stash/unstash files and see the current status easily.

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

This is what happens when I try to execute glo alias.

➜  dawidd6/homebrew-tap master ✗  glo
echo {} |grep -Eo '[a-f0-9]+' |head -1 |xargs -I% git show --color=always %  | diff-so-fancy | less --tabs=4 -RFX
Failed to read /dev/tty
➜  dawidd6/homebrew-tap master ✗  [3;1R

Does not happen with gd and ga for example.

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

Is there a way to ga multiple files without exiting back to the shell? I looked through the scripts and nothing jumped out, but maybe I'm missing something!

Hello and thank you for forgit. I think I am starting to like it.

But I didn't find diff-so-fancy (which you suggest in the README) to my particular liking so I removed it.

My git df alias uses -w to suppress white space changes to increase the content-wise SNR, and --word-diff=color to avoid excess lines in my diffs. I would like ga to show the same. Likewise others may have other diff preferences.

ga needn't do anything specific to support each option, but if you provide some mechanism to pass our desired options to git diff, such as from an environment variable FORGIT_DIFF_OPTIONS (similar to existing FORGIT_FZF_DEFAULT_OPTS) then it would be useful.

Thanks!

Hello there,

Could we have support for the git diff origin command?
Something like gd origin would be perfect.

Motivation:
git diff will only show the difference between what was committed and what is not committed.
When working with different branches, it is common workflow to commit locally, thus git diff will show no difference.

Just installed forgit using zplug. When running gd i get the following error. How can I debug this? other forgit commands seem to work fine

xargs: realpath: No such file or directory

First of all thank you very much for providing this plugin. Super useful!

It would also be great to include an interactive branch selection.

For example: expect gbr to interactively search through all branches.

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

Irrelevant

Feature

Add a new command, or extand ga for patch mode (git add --patch).

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

With the recent introduction of untracked files preview in PR #67 there is a problem concerning showing untracked files even if the user explicitly disabled that functionality in .git/config with this configuration:

[status]
  showUntrackedFiles = no

My use-case - I have a repo for my home directory that I use for my dotfiles. I've explicitly disabled untracked files in status as my entire home directory contents will be flagged as untracked. With that recent change ga will have to load 400k files before it present me with fzf picker which makes it unusable.

Solution - remove --untracked-files argument from both git status commands in forgit::add() function. It should work as before but it will allow people to disable them from git config.

Description

When I have changes in a sub-subdirectory, switch into the intermediate subdirectory and run gd, the diff preview from diff-so-fancy is empty (see screenshots below). The files are listed, but the paths are probably incorrect. Notice that although I've cd'ed into the subdirectory, the files listed in fzf still have the path related to the git root. Not sure though, if this is an issue with forgit or diff-so-fancy.

View from the root directory:

View from the subdirectory:

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

• OS

  • Mac OS X

• Shell

  • bash
  • zsh
  • fish

Problem / Steps to reproduce

When using gcf on fish with tab to multi-select, it will only select the first file, not multiple.

Multi select is working in ga, so just need to investigate why it's not working with the other

@wfxr when you get a chance, would you double check zsh and make sure this problem isn't there too?

The theme used in the pics in the readme.md is sweet. Can I please get the name or a export of the colour scheme or something?

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

i have constantly the same result: [bat error]: '[M] modified-file-name': No such file or directory (os error 2)

Color process logic in forgit::add is ugly and buggy. #3

It will not work on ANSI 256-color(like 228), 24-bit RGB color(like #ff0ab3), and complex color names(like blue reverse).

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Feature Request

When adding many files with ga, for example, it is nice to tab and add many of them at once.

Unfortunately when forgit starts, it begins at the bottom of the list, so the user must go all the way to the top of the list to tab down through the options

It would be nice if the cursor started at the top of the list, so the user just pushes "tab" multiple times to get through the whole list.

One option is to add
--reverse

to the FORGIT_FZF_DEFAULT_OPTS, but that reverses the whole layout. I'm not sure if we can just either switch the order of how tab works, or start at the top of the list!

So I currently use https://github.com/keis/git-fixup to list a number of commits that might be the commit that I'm aiming to fixup.

Is there anyway I can pass that list of commits to forgit and have it git show them in the widget?

TLDR; is there a way I can pass forgit a list of SHAs manually?

As the title of this issue suggests, I noticed that functions named forgit::fzf for example can't be used in /bin/sh:

sh-5.0$ forgit::fzf () {
> echo hello
> }
sh: `forgit::fzf': not a valid identifier
sh-5.0$

I know that in the past you've had 2 files for Bash/sh and for ZSH and that some-when you've made them symlinks. I agree that having just a single file is better but why use functions with names such as these and not use underscores?

I could send a patch to fix this but I wanted to ask first.

As once mentioned in a previous discussion we've had, This really bothers me because I use forgit in Git's shell aliases as explained in the linked comment from #12 . From some reason Git is also giving me the error not a valid identifier when I try to use forgit with it's shell aliases.

Describe the bug
I have this in my ~/.zshrc

# fzf & forgit
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
which fzf
hash fzf &>/dev/null || echo "hey I am working!"
[ -f ~/.forgit/forgit.plugin.zsh ] && source ~/.forgit/forgit.plugin.zsh

but when I restart my terminal here is the outpout:

/home/zezen/.fzf/bin/fzf
hey I am working!
[Warn] FZF not found and is requried for forgit

To Reproduce
I don't see anything I could have done wrong ...

Expected behavior
That it works (as they say)

Screenshots

Desktop (please complete the following information):

• OS:

Operating System: elementary OS 5.0 Juno
          Kernel: Linux 4.15.0-70-generic
    Architecture: x86-64

• Shell: zsh
• Shell Version: zsh 5.4.2 (x86_64-ubuntu-linux-gnu)
• Any other terminal config? antigen in zsh but not using it for fzf or forgit

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

gd or gd <directory> gives the unknown action: c |LESS='-R' less) error.

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Steps to reproduce

• Copy & Paste forgit.plugin.fisher to ~/.config/fish/forgit.plugin.fish
• add source ~/.config/fish/forgit.plugin.fish to the fisher config
• reload terminal
• also happens when using the "online" version source (curl -Ss https://raw.githubusercontent.com/wfxr/forgit/master/forgit.plugin.fish | psub)

Problem

Use of unsupported command chaining. When reloading the terminal I get the following errors:

~/.config/fish/forgit.plugin.fish (line 27): Unsupported use of '&&'. In fish, please use 'COMMAND; and COMMAND'.
type -q emojify >/dev/null 2>&1 && set forgit_emojify '|emojify'
                                 ^
from sourcing file ~/.config/fish/forgit.plugin.fish
	called on line 35 of file ~/.config/fish/config.fish

from sourcing file ~/.config/fish/config.fish
	called on line 1 of file -

in function “reload”
	called on standard input

source: Error while reading file “/home/fullname/.config/fish/forgit.plugin.fish”

I decided to do a quick&dirty fix by replacing all && with a ; with vim. I wanted to see if this was the only problem, even though it would probably break the functionality of the script. Then I got the following error:

~/.config/fish/forgit.plugin.fish (line 31): Unsupported use of '||'. In fish, please use 'COMMAND; or COMMAND'.
    forgit::inside_work_tree || return 1
                              ^
from sourcing file ~/.config/fish/forgit.plugin.fish
	called on line 35 of file ~/.config/fish/config.fish

from sourcing file ~/.config/fish/config.fish
	called on line 1 of file -

in function “reload”
	called on standard input

source: Error while reading file “/home/fullname/.config/fish/forgit.plugin.fish”

Applying another dirty fix by replacing || with ; I got the follwing message:

~/.config/fish/forgit.plugin.fish (line 47): Expected a command, but instead found end of the statement
    eval "git log --graph --color=always --format='%C(auto)%h%d %s %C(black)%C(bold)%cr' $argv $forgit_emojify" |
        env FZF_DEFAULT_OPTS="$opts" fzf
                                                                                                                 ^
from sourcing file ~/.config/fish/forgit.plugin.fish
	called on line 35 of file ~/.config/fish/config.fish

from sourcing file ~/.config/fish/config.fish
	called during startup

source: Error while reading file “/home/fullname/.config/fish/forgit.plugin.fish”
.v: No such file or directory

You can fix those by

• removing the new line character after the pipe
• add a \ to the end of line

Errors occourd on line

• 47
• 71
• 87 and following
• 193

As expected I removed all interpretation errors, but broke the program. ga simply exits with the return code 1

I don't know if it is intentional or not, but can not use fuzzy search on any window created by forgit. Only matching exactly file name works bringing correct results.

Thanks for your work. I've been using for some weeks and it is really helping my workflow.

Similarly to #29 I noticed that grh (git reset head) and ga (git add) were also lacking support for relative paths. Since your fix for #29 was easier than I expected, I thought I'll give it a try myself. I'll submit the PR shortly, looking forward to your feedback.

@cjappl Thank you for your excellent work to add issue templates for the project. I like it very much.

Now I have a suggestion that can we do some simplification on it considering the size and type of this project?

Maybe we can take fzf's template as the template of our issue template. It's simpler and more suitable for this project. What do you think?

Check list

• [x ] I have read through the README
• [ x] I have the latest version of forgit
• [ x] I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

I wrote

gi

in a git repository and instead of showing options to add .gitignore stuff it crashed to this

 npm ERR! code ENOENT                                                  ╰─                                                                                                                                                                   ─╯
                      npm ERR! syscall open
                                           npm ERR! path /home/penguin/proje

                                                                                                                                                                                                                                             s/package.json'
             npm ERR! enoent This is related to npm not being able to find

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

When running gd with one changed file, the diff editor does not open. Instead, you just see the "list" of changed files.

It would be nice to allow customization of git log formatting. Right now this seems to be hard coded in the code.

• OS
  • Linux
• Shell
  • zsh

Problem / Steps to reproduce

1. glo ref
2. press enter to select a commit ref
3. try selecting text with mouse for copy
4. can't select the text

So if you actually use git show ref, you are able to select text in the less output, but not with glo...

This is just to track on our end, so I can make sure it works eventually.

Fish 3.1.0 has a regression that breaks a lot of fzf functionality, details here:
fish-shell/fish-shell#6624
fish-shell/fish-shell#6692

Once these two issues are closed, we can test again. For now, all users who depend on forgit should only use fish 3.0

First, this script is so cool.

It would be great it can optionally support icdiff as a side by side viewer.

Essentially the code change would be some thing like:

cmd="git diff --color=always $commit -- {} $forgit_fancy"

to

cmd="git icdiff --color=always $commit -- {}

Thanks

Check list

• I have read through the README
• I have the latest version of forgit
• I have searched through the existing issues

Environment info

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

Problem / Steps to reproduce

On tmux when i call forgit::add i got some errors on displaying files and no preview window on fzf

If i call outside tmux error does not happens

I already tried changing $TERM variable, using tmux without any config file but no success. I know it's probably related to my configs, just wanted to know if this happens to you and if you know how to solve it.

Thanks!