diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/VCS_Info/VCS_INFO_quilt | 13 |
2 files changed, 10 insertions, 6 deletions
@@ -1,5 +1,8 @@ 2022-01-29 Daniel Shahaf <d.s@daniel.shahaf.name> + * 49722: Functions/VCS_Info/VCS_INFO_quilt: vcs_info quilt: + Refactor for readability. No functional change. + * 49715: Completion/Unix/Command/_subversion: add: Complete target arguments to this subcommand diff --git a/Functions/VCS_Info/VCS_INFO_quilt b/Functions/VCS_Info/VCS_INFO_quilt index 06feb4cce..22212171a 100644 --- a/Functions/VCS_Info/VCS_INFO_quilt +++ b/Functions/VCS_Info/VCS_INFO_quilt @@ -92,7 +92,7 @@ function VCS_INFO_quilt-patch2subject() { emulate -L zsh setopt extendedglob local mode="$1" - local patches pc tmp qstring root + local patches pc qstring root local -i ret local context local -a applied unapplied applied_string unapplied_string quiltcommand quilt_env @@ -135,12 +135,13 @@ function VCS_INFO_quilt-patch2subject() { zstyle -s "${context}" quiltcommand quiltcommand || quiltcommand='quilt' if [ -z "$patches" ]; then zstyle -s "${context}" quilt-patch-dir patches || patches="${QUILT_PATCHES}" + : ${patches:="patches"} if [[ "${patches}" != /* ]]; then - tmp=${patches:-patches} - VCS_INFO_quilt-dirfind "${tmp}" - ret=$? patches=$REPLY - (( ret )) && return ${ret} - patches=${patches}/${tmp} + if VCS_INFO_quilt-dirfind "${patches}"; then + patches="$REPLY/${patches}" + else + return $? + fi else [[ -d ${patches} ]] || return 1 fi |