diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-11-07 15:02:53 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-11-07 15:02:53 +0100 |
| commit | b95cf81b2aa59d41cebcee34359a35b562b86f11 (patch) | |
| tree | 90e0b592336c4f9b56595b962be411dafa4478ab /debian/patches/vcs_info_guilt_support.patch | |
| parent | d799ac78a744a5359563af55b4dee9e91255a1dc (diff) | |
| download | zsh-b95cf81b2aa59d41cebcee34359a35b562b86f11.tar.gz zsh-b95cf81b2aa59d41cebcee34359a35b562b86f11.zip | |
Remove patches applied upstream
Diffstat (limited to 'debian/patches/vcs_info_guilt_support.patch')
| -rw-r--r-- | debian/patches/vcs_info_guilt_support.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/debian/patches/vcs_info_guilt_support.patch b/debian/patches/vcs_info_guilt_support.patch deleted file mode 100644 index 8677c7229..000000000 --- a/debian/patches/vcs_info_guilt_support.patch +++ /dev/null @@ -1,23 +0,0 @@ -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@bewatermyfriend.org> -Bug: http://www.zsh.org/mla/workers/2013/msg00546.html - -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")"}) |