From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22762 invoked by alias); 16 Sep 2014 20:59:40 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 33188 Received: (qmail 25890 invoked from network); 16 Sep 2014 20:59:38 -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.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=COKR30sya1cGgevRTcCx5QU/w35lFnLOoKF+ComUkiw=; b=sGdZgjzyr1YSVbQOlPDS61ivoKZzgHeM9uDOlPBre6EqTpZo3RdbGs8FIQArO4Oh1v O9EwBuQOogDE1hU6HOdygRTp4X8tLChNoddU0IbJxFhwYaoqKUtCDWNFWE8zV+VgjBGI qZCrrRc8HX6/Clc7ZWgGy1jka2ekUEngzuTuOvPmD2a86J1nLcImA0Cs4sosDyCzJ/51 b4quS8Bg6eNb5XBEHsDsM3NrszOytixBc1HaK1oITnN7d+HWWg/hJnkhafPAVq0MnUg0 fvYJsg4h+zE6QA3rXtsqZrQUYhk5v9pP0dx3f4Glr0GvZs03tnFPouyULQIbh43Y0Tnu Jm/w== X-Received: by 10.194.92.42 with SMTP id cj10mr15561711wjb.113.1410901175859; Tue, 16 Sep 2014 13:59:35 -0700 (PDT) Date: Tue, 16 Sep 2014 22:57:26 +0200 From: Marc Finet To: Frank Terbeck Cc: zsh-workers@zsh.org Subject: Re: [PATCH 4/9] vcs_info git: set rrn before using it Message-ID: <20140916225726.1b587ea1@mlap.lactee> In-Reply-To: <87d2av2t8y.fsf@ft.bewatermyfriend.org> References: <1410557443-24178-1-git-send-email-m.dreadlock@gmail.com> <1410557443-24178-5-git-send-email-m.dreadlock@gmail.com> <8738bu8s34.fsf@ft.bewatermyfriend.org> <20140916220755.2e68c340@mlap.lactee> <87d2av2t8y.fsf@ft.bewatermyfriend.org> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.24; i586-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Tue, 16 Sep 2014 22:41:17 +0200 Frank Terbeck wrote: > Marc Finet wrote: > [...] > > diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git > > b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index > > 263a325..6231301 100644 --- > > a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ > > b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -115,6 > > +115,8 @@ VCS_INFO_git_getbranch () { > > gitdir=${vcs_comm[gitdir]} > > VCS_INFO_git_getbranch ${gitdir} > > +gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel ) > > +rrn=${gitbase:t} > > if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" > > get-revision ; then gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet > > --verify HEAD) > [...] > > This patch looks like it was mutilated by MUA. Could you resend? Maybe > using "git send-email" or if all else fails, the .patch file attached > to an email? Should be better now. Marc [still configuring my "new" machine]. This would fix handling get-revision, check-for-changes or check-for-staged-changes when set per repository. --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 263a325..6231301 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -115,6 +115,8 @@ VCS_INFO_git_getbranch () { gitdir=${vcs_comm[gitdir]} VCS_INFO_git_getbranch ${gitdir} +gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel ) +rrn=${gitbase:t} if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-revision ; then gitsha1=$(${vcs_comm[cmd]} rev-parse --quiet --verify HEAD) else @@ -154,8 +156,6 @@ fi VCS_INFO_adjust VCS_INFO_git_getaction ${gitdir} -gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel ) -rrn=${gitbase:t} local patchdir=${gitdir}/patches/${gitbranch} if [[ -d $patchdir ]] && [[ -f $patchdir/applied ]] \ -- 2.1.0