From 0c00eed4c77aee7af64e9272bfd1cddb8663e477 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Tue, 2 Oct 2018 15:20:53 +0000 Subject: 43588: 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. Use of '?' is consistent with these precedents: Backends/VCS_INFO_get_data_git:220: printf -v "git_patches_applied[$p]" "%04d ?" "$p" Backends/VCS_INFO_get_data_git:242: git_patches_applied+=("? $subject") Backends/VCS_INFO_get_data_git:244: git_patches_applied+=("?") VCS_INFO_quilt:160: applied[$i]+=" ?" VCS_INFO_quilt:168: unapplied[$i]+=" ?" --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Functions/VCS_Info/Backends/VCS_INFO_get_data_git') 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 -- cgit 1.4.1