diff options
| author | Frank Terbeck <ft@bewatermyfriend.org> | 2013-06-18 08:39:30 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2013-06-18 09:16:59 +0200 |
| commit | 88599a0508d584c8e899dc74640b5d58d3ec03c6 (patch) | |
| tree | d38b7f2189fd0dc61544ed1462e2526828568864 | |
| parent | 657d5464529c0e12944ad764aed373967f1825fb (diff) | |
| download | zsh-88599a0508d584c8e899dc74640b5d58d3ec03c6.tar.gz zsh-88599a0508d584c8e899dc74640b5d58d3ec03c6.tar.xz zsh-88599a0508d584c8e899dc74640b5d58d3ec03c6.zip | |
31485: vcs_info, git: Avoid error messages for `guilt' users
Guilt uses the same internal directory for keeping state as stgit, but it doesn't use the same files (not surprisingly). This caused error messages due to missing files. This fixes that by making the "stgit-active?" test stricter. Reported-by: Axel Beckert <abe@debian.org>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 6eb3d873a..b9d210269 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-06-18 Frank Terbeck <ft@bewatermyfriend.org> + + * 31485: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info, git: Avoid error messages for `guilt' users + 2013-06-13 Peter Stephenson <p.w.stephenson@ntlworld.com> * 31465: Completion/compinit, Src/glob.c, Src/pattern.c: fix diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 3f643a21f..c44be398e 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -136,7 +136,9 @@ gitbase=${PWD%/${$( ${vcs_comm[cmd]} rev-parse --show-prefix )%/##}} 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")"}) |