From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26695 invoked by alias); 12 Sep 2014 21:33:13 -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: 33146 Received: (qmail 9871 invoked from network); 12 Sep 2014 21:33:03 -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=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eoJePBpYodVj1HTy4dqboR7tTWhvseWmBzrzYzmO52E=; b=zGLGC4taZnnwTzaTaW7KQZe1V8YSZxgHAHsITEIZmtUcoiERa9f8q9gdCtk/wEIfQz IqIzHYLJHePKl76W4bYvyn/cU+aobxaD8DL+DtPQEpjE+BzVh2QUsuLpwQnomMBTmIRT fkmASoX9KtmtGGwRCldxvTXZdYe3XLQYHCdO3FPrtUknOJIgckMrsygO0iHK9FiDemUI 39uxJRGV/+kbzIv/Qng3NzUoPfZ0SQsTgxrkBo2NqCVuAOVYw8/879GNMhYtkbJiISeo hRg2rwq22LNBpKgKUiNV+QHrFcw3BJhDsH+3PseAIPl25RRgup7ntKsSNWgDUjl5siIR azCA== X-Received: by 10.180.72.170 with SMTP id e10mr5409451wiv.75.1410557577910; Fri, 12 Sep 2014 14:32:57 -0700 (PDT) From: Marc Finet To: zsh-workers@zsh.org Cc: Marc Finet Subject: [PATCH 4/9] vcs_info git: set rrn before using it Date: Fri, 12 Sep 2014 23:30:38 +0200 Message-Id: <1410557443-24178-5-git-send-email-m.dreadlock@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1410557443-24178-1-git-send-email-m.dreadlock@gmail.com> References: <1410557443-24178-1-git-send-email-m.dreadlock@gmail.com> This would fix setting check-for-changes or check-for-staged-changes 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..b5a38da 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -126,6 +126,8 @@ if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then return 1 fi +gitbase=$( ${vcs_comm[cmd]} rev-parse --show-toplevel ) +rrn=${gitbase:t} if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-changes" ; then querystaged=1 queryunstaged=1 @@ -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