about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_get_data_git4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 92646df79..79fbec278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2022-01-29  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* unposted: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
+	vcs_info git: Deconfuse $EDITOR
+
 	* unposted: Functions/VCS_Info/VCS_INFO_patch2subject,
 	Functions/VCS_Info/VCS_INFO_set-branch-format,
 	Functions/VCS_Info/VCS_INFO_set-patch-format: vcs_info: Add
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.