* [PATCH] vcs_info, git: Avoid error messages for `guilt' users
@ 2013-06-18 6:39 Frank Terbeck
0 siblings, 0 replies; only message in thread
From: Frank Terbeck @ 2013-06-18 6:39 UTC (permalink / raw)
To: zsh-workers
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>
---
Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git
index 3f643a2..c44be39 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")"})
--
1.8.3
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-06-18 7:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-18 6:39 [PATCH] vcs_info, git: Avoid error messages for `guilt' users Frank Terbeck
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).