[Pkg-zsh-commits] [SCM] Debian zsh package branch, debian, updated. debian/5.0.2-3-6-g3ff89eb

[Axel Beckert]

The following commit has been merged in the debian branch:
commit 3ff89eb47ed79278c110881d8d90f34421a97403
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Jun 17 18:25:21 2013 +0200

    Add patch to fix warnings in VCS_INFO's stgit support when guilt is used
    
    Thanks: Frank Terbeck <ft at bewatermyfriend.org> for the patch

diff --git a/debian/patches/series b/debian/patches/series
index 5fb231f..e530b1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 updates_needed_with_latest_texinfo.patch
 suppress_texinfo_warning_by_adding_item_arguments.patch
 texinfo_remove_leading_whitespace.patch
+vcs_info_guilt_support.patch
diff --git a/debian/patches/vcs_info_guilt_support.patch b/debian/patches/vcs_info_guilt_support.patch
new file mode 100644
index 0000000..cb0bb67
--- /dev/null
+++ b/debian/patches/vcs_info_guilt_support.patch
@@ -0,0 +1,22 @@
+Description: Fix warnings in VCS_INFO's stgit support when guilt is used
+ Without this patch, a git repository with guilt based patches would
+ cause VCS_INFO to emit the following warning:
+ "VCS_INFO_get_data_git:134: no such file or directory:
+ .git/patches/master/applied"
+Author: Frank Terbeck <ft at bewatermyfriend.org>
+
+Index: zsh/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
+===================================================================
+--- zsh.orig/Functions/VCS_Info/Backends/VCS_INFO_get_data_git	2013-01-05 04:47:29.000000000 +0100
++++ zsh/Functions/VCS_Info/Backends/VCS_INFO_get_data_git	2013-06-17 17:44:18.000000000 +0200
+@@ -128,7 +128,9 @@
+ rrn=${gitbase:t}
+ 
+ local patchdir=${gitdir}/patches/${gitbranch}
+-if [[ -d $patchdir ]] ; then
++if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \
++   && [[ -f $patchdir/unapplied ]]
++then
+     local -a stgit_applied stgit_unapplied stgit_all
+ 
+     stgit_applied=(${(f)"$(< "${patchdir}/applied")"})

-- 
Debian zsh package