mirror/ zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-05-20 06:56:05 +02:00
Code

39423: vcs_info git: Produce nicer applied-string messages for 'exec' actions. 

This changes the behaviour on "unknown" git-rebase actions (those other
than pick/reword/edit/fixup/squash/execute).
This commit is contained in:
Daniel Shahaf 2016-09-23 06:47:31 +00:00
parent 0e01942c07
commit 889f6690fd
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2016-09-24 Daniel Shahaf <d.s@daniel.shahaf.name>
* 39423: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Produce nicer applied-string messages for 'exec'
actions.
2016-09-23 Daniel Shahaf <d.s@daniel.shahaf.name>
* 39412: Src/Zle/computil.c: Fix directory completion when

8
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View File

@ -213,8 +213,12 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
local p
[[ -f "${patchdir}/done" ]] &&
for p in ${(f)"$(< "${patchdir}/done")"}; do
# remove action
git_patches_applied+=("${${(s: :)p}[2,-1]}")
# pick/edit/fixup/squash/reword: Add "$hash $subject" to $git_patches_applied.
# exec: Add "exec ${command}" to $git_patches_applied.
# (anything else): As 'exec'.
p=${p/(#s)(p|pick|e|edit|r|reword|f|fixup|s|squash) /}
p=${p/(#s)x /exec }
git_patches_applied+=("$p")
done
if [[ -f "${patchdir}/git-rebase-todo" ]] ; then
git_patches_unapplied=(${(f)"$(grep -v '^$' "${patchdir}/git-rebase-todo" | grep -v '^#')"})