about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrank Terbeck <bewater@users.sourceforge.net>2012-09-28 22:11:32 +0000
committerFrank Terbeck <bewater@users.sourceforge.net>2012-09-28 22:11:32 +0000
commit2e6363ed505157fd09f3f473356912bddf8ba640 (patch)
treecf028f5b3c0bd33b89c2075ff42cfd1f87cd5cdb
parent966bd9bd820a0710a4129d7bf1901126aca08ec5 (diff)
downloadzsh-2e6363ed505157fd09f3f473356912bddf8ba640.tar.gz
zsh-2e6363ed505157fd09f3f473356912bddf8ba640.tar.xz
zsh-2e6363ed505157fd09f3f473356912bddf8ba640.zip
Baptiste Daroussin: 30703: VCS_INFO_detect_fossil: Fix fossil detection on unix
-rw-r--r--ChangeLog6
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_detect_fossil2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 31c4cc4d9..d1ed83a0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 	* Seth House: 30701: Misc/vcs_info-examples: Added an hg hook
 	example to restore the 40-char hash
 
+	* Baptiste Daroussin: 30703:
+	Functions/VCS_Info/Backends/VCS_INFO_detect_fossil: Fix fossil
+	detection on unix
+
 2012-09-28  Oliver Kiddle <opk@zsh.org>
 
 	* 30697: Completion/Unix/Command/_dbus: new completion definition
@@ -188,5 +192,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5726 $
+* $Revision: 1.5727 $
 *****************************************************
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_fossil b/Functions/VCS_Info/Backends/VCS_INFO_detect_fossil
index 551528361..a44b33eb5 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_fossil
+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_fossil
@@ -7,7 +7,7 @@ setopt localoptions NO_shwordsplit
 [[ $1 == '--flavours' ]] && return 1
 
 VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
-vcs_comm[detect_need_file]=_FOSSIL_
+vcs_comm[detect_need_file]="_FOSSIL_ .fslckout"
 VCS_INFO_bydir_detect . || return 1
 
 return 0