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

45545: vcs_info git: In interactive rebases, ignore comment lines.

Browse source
This commit is contained in:
Daniel Shahaf 2020-03-12 18:48:51 +00:00
parent 754658aff3
commit af57462beb
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2020-03-15 Daniel Shahaf <danielsh@apache.org>
* 45545: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: In interactive rebases, ignore comment lines.
2020-03-13 dana <dana@dana.is>
* unposted: Completion/Unix/Command/_git: Fix copy/paste error

4
Functions/VCS_Info/Backends/VCS_INFO_get_data_git
View file

@ -202,6 +202,10 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then
# exec: Add "exec ${command}" to $git_patches_applied.
# (anything else): As 'exec'.
case $p in
([#]*)
# Comment line. Skip.
continue
;;
((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.