diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-06-17 18:25:21 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-06-17 18:25:21 +0200 |
| commit | 3ff89eb47ed79278c110881d8d90f34421a97403 (patch) | |
| tree | 6e2d8afe4c6f18be30932a96980a28b7b09853d8 | |
| parent | 80916d064696c6f4ec92f6620d3c392a9503dbaf (diff) | |
| download | zsh-3ff89eb47ed79278c110881d8d90f34421a97403.tar.gz zsh-3ff89eb47ed79278c110881d8d90f34421a97403.zip | |
Add patch to fix warnings in VCS_INFO's stgit support when guilt is used
Thanks: Frank Terbeck <ft@bewatermyfriend.org> for the patch
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/vcs_info_guilt_support.patch | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 5fb231fc4..e530b1d79 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 000000000..cb0bb6726 --- /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@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")"}) |