From c62db9e7dc2f59337aec1df55663383c524886cb Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 22 Oct 2015 12:30:24 +0000 Subject: 36912: vcs_info quilt: Tolerate being in child of .pc's parent Without this, gen-applied-string would only be set when .pc is a child of cwd, not when it is a child of an ancestor of cwd. --- ChangeLog | 5 +++++ Functions/VCS_Info/VCS_INFO_quilt | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index ef5cbe1f0..fe93bc724 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-10-24 Daniel Shahaf + + * 36912: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt: + Tolerate being in child of .pc's parent + 2015-10-24 Peter Stephenson * unposted: Src/utils.c: small typo. diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt index bc71cfb7d..29603a27a 100644 --- a/Functions/VCS_Info/VCS_INFO_quilt +++ b/Functions/VCS_Info/VCS_INFO_quilt @@ -119,6 +119,7 @@ function VCS_INFO_quilt() { applied=() fi patches=$(<$pc/.quilt_patches) + patches=`builtin cd -q "${pc:h}" && print -r - ${patches:A}` fi if zstyle -t "${context}" get-unapplied; then # This zstyle call needs to be moved further up if `quilt' needs -- cgit 1.4.1