From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24793 invoked by alias); 12 Sep 2014 21:40: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: 33148 Received: (qmail 10591 invoked from network); 12 Sep 2014 21:40:39 -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=R5C5gzxUs0ojEWn2S9dm2iGOSZAH0Z2DRbALpSSgvjw=; b=RqoherCuqewst0BkDxjxHCRui70I7OGI8ciWFsSLYlpwMRjyMACF7rmnwlt/i8EriN kbK2eUv0ua4ZNpW90a29GuOKHiqtHiUf1Tn/tSwNQqIvbqQ9mZUqqgCoegCClZQ7naG6 vFcXl5cATODFaKfTAmppiPrEQT/X6zc83+Ok/fPqXykYpZhxyGjkswdBICMmBVH7IJvC dzZGvstw/vTK2rWPCOdolfqWHE3gJcpBFKtH5SZut97mxlpjLxn+HjTWeCqhYTNqC/NA X5CxyMVK//6HxxXL4eBbejk9vHy5W8/iP7NHaOlGJGvXuqS339pg/n5xO0B7rAFTlkRc f1zQ== X-Received: by 10.180.228.106 with SMTP id sh10mr5556282wic.65.1410557578893; Fri, 12 Sep 2014 14:32:58 -0700 (PDT) From: Marc Finet To: zsh-workers@zsh.org Cc: Marc Finet Subject: [PATCH 5/9] vcs_info quilt: fix standalone detection Date: Fri, 12 Sep 2014 23:30:39 +0200 Message-Id: <1410557443-24178-6-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> Since VCS_INFO_bydir_detect always uses the vcs_comm[detect_need_file], it should be cleared when querying it without file. --- Functions/VCS_Info/VCS_INFO_quilt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt index 7001eca..db15dda 100644 --- a/Functions/VCS_Info/VCS_INFO_quilt +++ b/Functions/VCS_Info/VCS_INFO_quilt @@ -70,13 +70,11 @@ function VCS_INFO_quilt-dirfind() { olddir=${vcs_comm[basedir]} vcs_comm[basedir]='' - if [[ -n "${file}" ]]; then - oldfile=${vcs_comm[detect_need_file]} - vcs_comm[detect_need_file]=${file} - fi + oldfile=${vcs_comm[detect_need_file]} + vcs_comm[detect_need_file]=${file} VCS_INFO_bydir_detect ${dir} ret=$? - [[ -n "${file}" ]] && vcs_comm[detect_need_file]=${oldfile} + vcs_comm[detect_need_file]=${oldfile} printf '%s' ${vcs_comm[basedir]} vcs_comm[basedir]="${olddir}" return ${ret} -- 2.1.0