Merge remote-tracking branch 'andreyorst/universal-git-path'

This commit is contained in:
Maxime Coste 2019-09-16 07:06:50 +10:00
commit 6d085f995e

View File

@ -91,7 +91,7 @@ Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-
} }
update_diff() { update_diff() {
git --no-pager diff -U0 "$kak_buffile" | perl -e ' ( cd "${kak_buffile%/*}" && git --no-pager diff -U0 "$kak_buffile" | perl -e '
$flags = $ENV{"kak_timestamp"}; $flags = $ENV{"kak_timestamp"};
foreach $line (<STDIN>) { foreach $line (<STDIN>) {
if ($line =~ /@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))?/) { if ($line =~ /@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))?/) {
@ -140,7 +140,7 @@ Available commands:\n add\n rm\n blame\n commit\n checkout\n diff\n hide-
} }
} }
print "set-option buffer git_diff_flags $flags" print "set-option buffer git_diff_flags $flags"
' ' )
} }