From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5628 invoked by alias); 12 Sep 2014 22:01:42 -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: 33152 Received: (qmail 24328 invoked from network); 12 Sep 2014 22:01:32 -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=RZzDNU2FwZAahpLFHVCJj4eX1y/5DyEDrmPWyiG4xzU=; b=QxNCPPStMpfxenUi3DSxjx5wOZWm9ilK2VNHwc9szblKGcRvMh2zMeX0u0shWYCjga zmMysUzKXkSbpGWJtGJisRsOehNtZ66SeZNFZ1/rsDQ89u/KgBosiQLXShMMThBMik69 5xWj3oZ5kPiLjXjqdgfxbLPc51BPWc1T07Eyrh7ataDVczbjakHSeaAwFTxGeqduse4K 5VRQGT+OBK8orTG7agXWwoii9vNdbTwtd6QVwIZ+LEcJ9UwagpwC5VyOtl0TJC3LL6ys oRGr/ZSm6sMegaH1NqpLE5IVtBMn0Lg8j9jm89gWLIwAJ18IpAGzHqGhs67MwKUbAkk+ Q6kg== X-Received: by 10.180.77.193 with SMTP id u1mr5624386wiw.45.1410557579892; Fri, 12 Sep 2014 14:32:59 -0700 (PDT) From: Marc Finet To: zsh-workers@zsh.org Cc: Marc Finet Subject: [PATCH 6/9] vcs_info quilt: fix unapplied detection on sub-directory Date: Fri, 12 Sep 2014 23:30:40 +0200 Message-Id: <1410557443-24178-7-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> When being in a subdirectory of a "repo" being handled with quilt, the `quilt unapplied` command returns all the patches because QUILT_PATCHES is an absolute path (which exists and is a dir) and quilt considers that .pc should in current directory. Changing quilt might be overkill and it seems that QUILT_PATCHES should just be a name, not an absolute path. --- Functions/VCS_Info/VCS_INFO_quilt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt index db15dda..53835dd 100644 --- a/Functions/VCS_Info/VCS_INFO_quilt +++ b/Functions/VCS_Info/VCS_INFO_quilt @@ -134,7 +134,7 @@ function VCS_INFO_quilt() { # This zstyle call needs to be moved further up if `quilt' needs # to be run in more places than this one. zstyle -s "${context}" quiltcommand quiltcommand || quiltcommand='quilt' - unapplied=( ${(f)"$(QUILT_PATCHES=$patches $quiltcommand --quiltrc /dev/null unapplied 2> /dev/null)"} ) + unapplied=( ${(f)"$(QUILT_PATCHES=$(basename $patches) $quiltcommand --quiltrc /dev/null unapplied 2> /dev/null)"} ) unapplied=( ${unapplied:#} ) else unapplied=() -- 2.1.0