diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2018-10-07 Daniel Shahaf <d.s@daniel.shahaf.name> + * 43588: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Make sure applied-patches is of the form "$hash + $subject" --- that is, has a space and a non-empty second + argument --- even with future 'git rebase -i' verbs. + * 43586: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: Reformat to minimise next diff. No functional change. diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 892b4741f..087a8a283 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -203,6 +203,11 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then # "$hash $subject", but I hope this counts as making an effort. p=${p/x /exec } ;; + (*) + # Forward compatibility with not-yet-existing 'git rebase -i' verbs. + if [[ $p != *\ * ]]; then + p+=" ?" + fi esac git_patches_applied+=("$p") done |