diff options
| author | Daniel Shahaf <danielsh@apache.org> | 2020-03-12 18:48:51 +0000 |
|---|---|---|
| committer | Daniel Shahaf <danielsh@apache.org> | 2020-03-15 00:18:21 +0000 |
| commit | af57462beb38159637eba7004363d867f41eff50 (patch) | |
| tree | a96aa0be7b999ffb1ad572f9f650eed067ead266 | |
| parent | 754658aff38e1bdf487c58bec6174cbecd019d11 (diff) | |
| download | zsh-af57462beb38159637eba7004363d867f41eff50.tar.gz zsh-af57462beb38159637eba7004363d867f41eff50.tar.xz zsh-af57462beb38159637eba7004363d867f41eff50.zip | |
45545: vcs_info git: In interactive rebases, ignore comment lines.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 6fdaccb7f..fa59d44e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 5ddce72a6..a8f49e24a 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -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. |