From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-32064-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 23758 invoked by alias); 28 Nov 2013 07:24:02 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 32064
Received: (qmail 7099 invoked from network); 28 Nov 2013 07:23:56 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW
	autolearn=ham version=3.3.2
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to
         :cc:subject:references:in-reply-to:content-type;
        bh=SRTNQCZV4gg5SwTnSJStAKvvsw63RQ1E5P7uERqKRhc=;
        b=EvuTlqsj11vW4HaH176+Sh9Cih5JF3oeWzAzKb5vOsGU3VYTIBXJvFIJ1RKkZNyl4b
         I7nU4ae1FUCALNIRsFBwi+nRgnkKcaZeZ8uum/5zNqFJZUOiKSn1yOlEvEu43PBdQw1J
         jtq4AtiiWju/J/bYcClv0iV0xuCwMGd4HfBibXzUfqo+s/DY7yeS+3zkqmfcMZAiZvIq
         +44RLfZIjQ/b/NAUL3G1lBeofmj/dwcqvJKRMCoJnPVRXk7WNc36TLRORqEWgqz0Nr4G
         5ANqqHYjvTs/SnPr+5ujCOimuW0F/6/2HjA8xC18XMq69aVjgILY5vUIxpk70N6/hLj6
         0hlQ==
X-Gm-Message-State: ALoCoQmhdL4E0J+9z75UuFVid5V287hnV071GNJXeJ8zSvZzssO7RP8/5eV1TlxdJI04I74itz6R
X-Received: by 10.68.197.200 with SMTP id iw8mr716226pbc.197.1385623432197;
        Wed, 27 Nov 2013 23:23:52 -0800 (PST)
Message-ID: <5296EF7E.1010407@topbug.net>
Date: Wed, 27 Nov 2013 23:23:42 -0800
From: Hong Xu <hong@topbug.net>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.1.1
MIME-Version: 1.0
To: Bart Schaefer <schaefer@brasslantern.com>
CC: zsh-workers@zsh.org
Subject: Re: vcs_info '%r' doesn't work properly when entered a subdirectory
 of a git repository through a symlink
References: <528D65C2.2080607@topbug.net> <20131121231319.GA23989@pug.qqx.org> <131121161050.ZM13254@torch.brasslantern.com> <528EB952.8010309@topbug.net>
In-Reply-To: <528EB952.8010309@topbug.net>
Content-Type: multipart/mixed;
 boundary="------------080202070001060505070107"

--------------080202070001060505070107
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

On 11/21/13, 5:54 PM, Hong Xu wrote:
> On Thu Nov 21 16:10:50 2013, Bart Schaefer wrote:
>> On Nov 21,  6:13pm, Aaron Schrab wrote:
>> }
>> } This sounds like it may be the same issue that was addressed by the
>> } patch in workers:31985
>> (http://www.zsh.org/mla/workers/2013/msg01038.html),
>> } sent by Clemens Hammacher.
>>
>> That's probably true, but looking at VCS_INFO_reposub I think applying
>> 31985 is still going to break %S in the way Hong already mentioned.
>
> I just tested this patch, yes it did break %S.


I tested the attached patch and it fixes the issue without breaking %S 
for me. Please give it a try, and if it is good, could you include this 
patch?

Thanks!
Hong


--------------080202070001060505070107
Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0";
 name="vcs_git.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
 filename="vcs_git.patch"

ZGlmZiAtLWdpdCBhL0Z1bmN0aW9ucy9WQ1NfSW5mby9CYWNrZW5kcy9WQ1NfSU5GT19nZXRf
ZGF0YV9naXQgYi9GdW5jdGlvbnMvVkNTX0luZm8vQmFja2VuZHMvVkNTX0lORk9fZ2V0X2Rh
dGFfZ2l0CmluZGV4IGM0NGJlMzkuLmNkOGYwNjQgMTAwNjQ0Ci0tLSBhL0Z1bmN0aW9ucy9W
Q1NfSW5mby9CYWNrZW5kcy9WQ1NfSU5GT19nZXRfZGF0YV9naXQKKysrIGIvRnVuY3Rpb25z
L1ZDU19JbmZvL0JhY2tlbmRzL1ZDU19JTkZPX2dldF9kYXRhX2dpdApAQCAtMTMyLDcgKzEz
Miw3IEBAIGZpCiAKIFZDU19JTkZPX2FkanVzdAogVkNTX0lORk9fZ2l0X2dldGFjdGlvbiAk
e2dpdGRpcn0KLWdpdGJhc2U9JHtQV0QlLyR7JCggJHt2Y3NfY29tbVtjbWRdfSByZXYtcGFy
c2UgLS1zaG93LXByZWZpeCApJS8jI319CitnaXRiYXNlPSR7JChwd2QgLVApJS8keyQoICR7
dmNzX2NvbW1bY21kXX0gcmV2LXBhcnNlIC0tc2hvdy1wcmVmaXggKSUvIyN9fQogcnJuPSR7
Z2l0YmFzZTp0fQogCiBsb2NhbCBwYXRjaGRpcj0ke2dpdGRpcn0vcGF0Y2hlcy8ke2dpdGJy
YW5jaH0KZGlmZiAtLWdpdCBhL0Z1bmN0aW9ucy9WQ1NfSW5mby9WQ1NfSU5GT19yZXBvc3Vi
IGIvRnVuY3Rpb25zL1ZDU19JbmZvL1ZDU19JTkZPX3JlcG9zdWIKaW5kZXggMGZhYjg2My4u
MWMxNmYwZSAxMDA2NDQKLS0tIGEvRnVuY3Rpb25zL1ZDU19JbmZvL1ZDU19JTkZPX3JlcG9z
dWIKKysrIGIvRnVuY3Rpb25zL1ZDU19JbmZvL1ZDU19JTkZPX3JlcG9zdWIKQEAgLTUsOSAr
NSw5IEBACiBzZXRvcHQgbG9jYWxvcHRpb25zIGV4dGVuZGVkZ2xvYiBOT19zaHdvcmRzcGxp
dAogbG9jYWwgYmFzZT0kezElJS8jI30KIAotW1sgJHtQV0R9ID09ICR7YmFzZX0vKiBdXSB8
fCB7CitbWyAkKHB3ZCAtUCkgPT0gJHtiYXNlfS8qIF1dIHx8IHsKICAgICBwcmludGYgJy4n
CiAgICAgcmV0dXJuIDEKIH0KLXByaW50ZiAnJXMnICR7UFdEIyRiYXNlL30KK3ByaW50ZiAn
JXMnICR7JChwd2QgLVApIyRiYXNlL30KIHJldHVybiAwCg==
--------------080202070001060505070107--