diff --git a/bin/git-forgit b/bin/git-forgit index 726f212e..7f0f52f6 100755 --- a/bin/git-forgit +++ b/bin/git-forgit @@ -454,17 +454,18 @@ _forgit_stash_push() { *) _forgit_git_stash_push "${args[@]}"; return $? esac done - local opts files + local opts files rootdir opts=" $FORGIT_FZF_DEFAULT_OPTS -m $FORGIT_STASH_PUSH_FZF_OPTS " + rootdir=$(git rev-parse --show-toplevel) # Show both modified and untracked files files=() while IFS='' read -r file; do files+=("$file") - done < <(git ls-files --exclude-standard --modified --others | + done < <(git ls-files "$rootdir" --exclude-standard --modified --others | FZF_DEFAULT_OPTS="$opts" fzf --preview="$FORGIT stash_push_preview {}") [[ "${#files[@]}" -eq 0 ]] && return 1 _forgit_git_stash_push ${msg:+-m "$msg"} -u "${files[@]}"