From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: zsh-workers-return-43619-ml=inbox.vuxu.org@zsh.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 18c8aa64 for ; Sun, 7 Oct 2018 17:48:23 +0000 (UTC) Received: (qmail 23268 invoked by alias); 7 Oct 2018 17:47:01 -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: List-Unsubscribe: X-Seq: 43619 Received: (qmail 28447 invoked by uid 1010); 7 Oct 2018 17:47:01 -0000 X-Qmail-Scanner-Diagnostics: from out3-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.27):SA:0(-2.6/5.0):. Processed in 6.976174 secs); 07 Oct 2018 17:47:01 -0000 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=from:to:subject:date:message-id :in-reply-to:references; s=fm1; bh=tCPPA4oIT+FkCMEJBxwQcwSlSRSBa oIviBJ3iibvjnk=; b=eKohCIuvw2Ip8bmd829BDNR/PnDCGvN2NKuy8ZUkaQBFE z5ZjXMU/1Ch5nYH9yEomwr6vkkPE3XkqSTFkEajB28QGPBnP0123bAG2JVi5LB0+ i/wJZoZTEduMfk6RPgl3Ry8l2xhxSzOSYat819OTLwOx7n9LVhlOWHURMeRDYW90 UIhUD/e42ERN+5Arph7jLnJoZRsefeAgbxK0JhFRRdcG8DjPlfAkcKcGl5CONo5J ruKH3xpBBZUL2LhIO8NTE9LMUevE2lYLjPyxZTQRd1HpdGHPz+MddQpmKNSa9DdW LPU4Kjm/kENP1Z4F5coBn8vdjpWybtN/dHrB1+6vA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=tCPPA4oIT+FkCMEJBxwQcwSlSRSBa oIviBJ3iibvjnk=; b=c2RV7NsZW1fkgX57KRiiaZWJvjmgd+02ippRc1xJpkwoH 65FRyLEnDEW2kU5OGVj9iFM545kxwP6wrlAl3v8o1Q4ZahO80s9GiWuBN/rC5jtv 4LiZ6Y8RkuLOcuj7I5E8vTjCrX2qAiAJ5eQRJhz86sm+XXWHnICg0xYiFuh7o+q3 v4xPqee2ikbo+6XcOB4gk455kPPiowbt8/4KbYPIIoAfWkBwIQHBnjETDw/ksSjX tyEMcJqTMN1mFCD3uMqGajpm6OhzHEhMTOkdWiTZunzs9i4P0EfrtQDSdfTgUsy7 X3GtXrCs6bh4RHfSw/c4zDH3ftu1/clnvkQOVDlyQ== X-ME-Sender: X-ME-Proxy: From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 2/4] vcs_info git: In non-interactive rebases, always set $hook_com[git_patches_applied] to a string of the form 'foo bar', never just 'foo'. Date: Sun, 7 Oct 2018 17:46:41 +0000 Message-Id: <20181007174643.16262-2-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181007174643.16262-1-danielsh@tarpaulin.shahaf.local2> References: <20181007174643.16262-1-danielsh@tarpaulin.shahaf.local2> --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 0050f613a..cd57902b6 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -260,18 +260,11 @@ elif [[ -d "${gitdir}/rebase-apply" ]]; then subject=$REPLY } fi + subject=${subject:-'?'} if [[ -f "${patchdir}/original-commit" ]]; then - if [[ -n $subject ]]; then - git_patches_applied+=("$(< ${patchdir}/original-commit) $subject") - else - git_patches_applied+=("$(< ${patchdir}/original-commit)") - fi + git_patches_applied+=("$(< ${patchdir}/original-commit) $subject") else - if [[ -n $subject ]]; then - git_patches_applied+=("? $subject") - else - git_patches_applied+=("?") - fi + git_patches_applied+=("? $subject") fi local last="$(< "${patchdir}/last")" if (( cur+1 <= last )); then