From 42f1e99f816d7b8d2376caea69d0acd85ee729a4 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 29 Jan 2022 12:47:54 +0000 Subject: unposted: vcs_info git: Deconfuse $EDITOR Work around . --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Functions/VCS_Info') diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index eb04d4b41..ba588c874 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -207,7 +207,7 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then # Comment line. Skip. return 0 ;; - ((p|pick|e|edit|r|reword|f|fixup|s|squash)' '*) + (''(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. p=${p#* } @@ -230,7 +230,7 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then p="${p%% *} ?" fi ;; - ((x|exec) *) + (''(x|exec) *) # The line is of the form 'exec foo bar baz' where 'foo bar # baz' is a shell command. There's no way to map _that_ to # "$hash $subject", but I hope this counts as making an effort. -- cgit 1.4.1