zsh-workers
 help / color / mirror / code / Atom feed
From: Frank Terbeck <ft@bewatermyfriend.org>
To: zsh-workers@zsh.org
Cc: lhw@ring0.de, 611175@bugs.debian.org,
	Phil Pennock <zsh-workers+phil.pennock@spodhuis.org>
Subject: PATCH: Fix for vcs_info's svn detection
Date: Fri, 11 Feb 2011 07:47:03 +0100	[thread overview]
Message-ID: <8739nvgja0.fsf@ft.bewatermyfriend.org> (raw)

Let's try this again, shall we? Apparently, it's harder to use an email
client than it looks. Also, as Mikael informs me on IRC, I screwed up
the patch in the first mail... *sigh*

...now that CVS is back...

Here's a fix for an issue with vcs_info's subversion detection, which
was reported in the debian BTS (issue #611175¹).

The fix was suggested by Lennart Weller.

¹ <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D611175>

Regards, Frank


Index: Functions/VCS_Info/Backends/VCS_INFO_detect_svn
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/VCS_Info/Backends/VCS_INFO_detect_svn,v
retrieving revision 1.2
diff -u -r1.2 VCS_INFO_detect_svn
--- Functions/VCS_Info/Backends/VCS_INFO_detect_svn	11 Dec 2008 09:53:13 -0000	1.2
+++ Functions/VCS_Info/Backends/VCS_INFO_detect_svn	11 Feb 2011 06:44:51 -0000
@@ -7,5 +7,5 @@
 [[ $1 == '--flavours' ]] && return 1
 
 VCS_INFO_check_com ${vcs_comm[cmd]} || return 1
-[[ -d ".svn" ]] && return 0
+{ [[ -f ".svn/entries" ]] || [[ -f ".svn/format" ]] } && return 0
 return 1


             reply	other threads:[~2011-02-11  6:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-11  6:47 Frank Terbeck [this message]
2011-02-11 15:07 ` Greg Klanderman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8739nvgja0.fsf@ft.bewatermyfriend.org \
    --to=ft@bewatermyfriend.org \
    --cc=611175@bugs.debian.org \
    --cc=lhw@ring0.de \
    --cc=zsh-workers+phil.pennock@spodhuis.org \
    --cc=zsh-workers@zsh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).