From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: zsh-workers-return-43588-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 457d2b07 for ; Tue, 2 Oct 2018 15:22:23 +0000 (UTC) Received: (qmail 7022 invoked by alias); 2 Oct 2018 15:21:12 -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: 43588 Received: (qmail 19890 invoked by uid 1010); 2 Oct 2018 15:21:12 -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 9.534172 secs); 02 Oct 2018 15:21:12 -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=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=jRyr6xeEtioMFDZ3UfNJgb64JNY/e+JZ/nnKv9JAw+c=; b=EdAMJirZ 67mpKX5ESu6rXZGqAv2jhErnc9poILf5gsJiIdgz4/rUqMz4XlnCbLEYz32ZQD0K TvYsJXYZzMi0OP+AnUhxfqLrQLm+M70VzRzxWI6hSEVNDg2O2nR3Z+7v2Z9yZe5H sRYLm7R8rLBKV7VztjdiKINU8V3K/laiIwykaIQrg0B9Td3GhTMVG0a3G1lVJ63H Zp/0p4o05XULKFjxwZWXURydUUWzQZ5DaVOcwevrVVcHMzENHiMfnrpPwAnJCAXy jCkw1uDFoCqFHnI0qjetd2DaUOJpVVz5ttYpB6pfdKZMKcse7yeF7UX4OXDx/6bv GfuYsthucjb3EQ== 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-sender:x-me-sender:x-sasl-enc; s= fm3; bh=jRyr6xeEtioMFDZ3UfNJgb64JNY/e+JZ/nnKv9JAw+c=; b=YrIW0Uig cM3kFHjd2XMcU1o/ra5T/6qOYWdCU2Jk+xX+wwLjs71Lb48n1zYd24X92wlEjdkt PPiIxBENiKRi0jfq5/2PIcAkgZ9d9GMC6yve3IwURHcEpJQ6SMjswvPsGVQnwbws kpBlc3LTBA0WcgtQHWGws4K65B7fud9lq64g6bqq+vlQzMEBP1yYjMCht/7ysejR WmbSH3GFZikGnuplFvbilhsrdxLucmH8REVkTgZHzD/p4cGIafdtChS1WWDeu+e2 3CzvcJDWJFWUsIYDDXgaH7NrhXFtgoVRGHym75zh0iKmrHqLfmzbMVdRx8jW9bx5 RLGpf5KmC1ctRw== X-ME-Sender: X-ME-Proxy: From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 2/3] vcs_info git: Make sure applied-patches is of the form "$hash $subject" --- that is, has a space and a non-empty second argument --- even with future 'git rebase -i' verbs. Date: Tue, 2 Oct 2018 15:20:53 +0000 Message-Id: <20181002152054.28358-2-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181002152054.28358-1-danielsh@tarpaulin.shahaf.local2> References: <20181002152054.28358-1-danielsh@tarpaulin.shahaf.local2> Use of '?' is consistent with these precedents: Backends/VCS_INFO_get_data_git:220: printf -v "git_patches_applied[$p]" "%04d ?" "$p" Backends/VCS_INFO_get_data_git:242: git_patches_applied+=("? $subject") Backends/VCS_INFO_get_data_git:244: git_patches_applied+=("?") VCS_INFO_quilt:160: applied[$i]+=" ?" VCS_INFO_quilt:168: unapplied[$i]+=" ?" --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index af7466be5..f38a0d370 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -202,6 +202,11 @@ elif [[ -d "${gitdir}/rebase-merge" ]]; then # "$hash $subject", but I hope this counts as making an effort. p=${p/x /exec } ;; + (*) + # Forward compatibility with not-yet-existing 'git rebase -i' verbs. + if [[ $p != *\ * ]]; then + p+=" ?" + fi esac git_patches_applied+=("$p") done