utils-code/wfxr.forgit
1
0
Fork 0
mirror of https://github.com/wfxr/forgit.git synced 2026-09-10 07:16:23 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat: 🎸 Improve diff preview on untracked files for ga. #66

Browse source
This commit is contained in:
Wenxuan Zhang 2019-12-22 11:38:12 +08:00 committed by Wenxuan
parent 10308be2c3
commit 1cdc643e84
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
forgit.plugin.zsh
View file

@ -59,16 +59,20 @@ forgit::add() {
opts="
$FORGIT_FZF_DEFAULT_OPTS
-0 -m --nth 2..,..
--preview=\"git diff --color=always -- {-1} | $forgit_pager\"
--preview=\"if (git status --porcelain -- {-1} | grep '^??') &>/dev/null; then # diff with /dev/null for untracked files
git diff --color=always --no-index -- /dev/null {-1} | $forgit_pager | sed '2 s/added: /untracked: /'
else
git diff --color=always -- {-1} | $forgit_pager;
fi\"
$FORGIT_ADD_FZF_OPTS
"
files=$(git -c color.status=always -c status.relativePaths=true status --short |
files=$(git -c color.status=always -c status.relativePaths=true status --short --untracked-files |
grep -F -e "$changed" -e "$unmerged" -e "$untracked" |
sed -E 's/^(..[^[:space:]]*)[[:space:]]+(.*)$/[\1] \2/' |
FZF_DEFAULT_OPTS="$opts" fzf |
sed 's/^.*] //' |
sed 's/.* -> //') # for rename case
[[ -n "$files" ]] && echo "$files"| tr '\n' '\0' |xargs -0 -I% git add % && git status --short && return
[[ -n "$files" ]] && echo "$files"| tr '\n' '\0' |xargs -0 -I% git add % && git status --short --untracked-files && return
echo 'Nothing to add.'
}