summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarc Finet <m.dreadlock@gmail.com>2014-09-12 23:30:41 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2014-09-14 12:02:37 +0200
commitd5f574e20a7cc4c202433fe28f30c37b13299d61 (patch)
tree687a8f6b514bfa1354c77e1ead25bd4e0d110819
parent06e03e72345f06ca38e331099f6290a4e0e07891 (diff)
downloadzsh-d5f574e20a7cc4c202433fe28f30c37b13299d61.tar.gz
zsh-d5f574e20a7cc4c202433fe28f30c37b13299d61.tar.xz
zsh-d5f574e20a7cc4c202433fe28f30c37b13299d61.zip
33145: vcs_info git: fix applied-string name
Documentation and hg backend use applied-string. patch-string does not
appear anywhere.
-rw-r--r--ChangeLog3
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_get_data_git2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ec6557e1d..7ae89daf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
 	* 33148: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt:
 	refactor standalone detection
 
+	* 33145: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
+	vcs_info git: fix applied-string name
+
 2014-09-12  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* 33143: Src/init.c: POSIX_ARGZERO more closely matches bash et al.
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 263a3258e..8f9aa2a19 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
@@ -176,7 +176,7 @@ then
             stgitpatch=""
         fi
     else
-        stgitpatch=${hook_com[patch-string]}
+        stgitpatch=${hook_com[applied-string]}
     fi
     hook_com=()
     if VCS_INFO_hook 'gen-unapplied-string' "${stgit_unapplied[@]}"; then