mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

unposted: vcs_info git: Deconfuse $EDITOR

Browse source 
Work around <https://github.com/chrisbra/vim-zsh/issues/39>.
This commit is contained in:
Daniel Shahaf 2022-01-29 12:47:54 +00:00
parent c055c6464d
commit 42f1e99f81
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2022-01-29 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Deconfuse $EDITOR
* unposted: Functions/VCS_Info/VCS_INFO_patch2subject,
Functions/VCS_Info/VCS_INFO_set-branch-format,
Functions/VCS_Info/VCS_INFO_set-patch-format: vcs_info: Add

4
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -207,7 +207,7 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
# Comment line. Skip.
return 0
;;
((p|pick|e|edit|r|reword|f|fixup|s|squash)' '*)
(''(p|pick|e|edit|r|reword|f|fixup|s|squash)' '*)
# The line is of the form "pick $hash $subject".
# Just strip the verb and we're good to go.
p=${p#* }
@ -230,7 +230,7 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
p="${p%% *} ?"
fi
;;
((x|exec) *)
(''(x|exec) *)
# The line is of the form 'exec foo bar baz' where 'foo bar
# baz' is a shell command. There's no way to map _that_ to
# "$hash $subject", but I hope this counts as making an effort.