From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 892 invoked by alias); 18 Aug 2018 15:57:30 -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: 43314 Received: (qmail 19355 invoked by uid 1010); 18 Aug 2018 15:57:30 -0000 X-Qmail-Scanner-Diagnostics: from out1-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.25):SA:0(-2.6/5.0):. Processed in 4.086099 secs); 18 Aug 2018 15:57:30 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_PASS,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.1 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:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=mm5XAsgK1sxEPPjla SW0XBNtHqmaHTEACbUmZMoJOms=; b=jIsCDulS6aYduSlIm9/4IWPNkyrkebzGU gVW0I4cwN5smGrgz+AgXSG7UvNMl2UD+BJboltTqPKbkpwRp3jeMjbWLiXRQHrEk q/DIPX7jOm/tDCrexDDGnprqAxrebD81IEPDoLqyt0hNfGU12lEbHeqJzbGqMZkP nFHYND4tW3nQp55yxbUDE3AH0skjsVj8n0OzN9XQodGB9Ez0uvrqZwMJcml6l/VZ VIpN7QW0x/vYs6h/0L14hh/aDScrP6yRTeb5C3c7B1ZMQCkQFEdqFQ9GVGZACjEc x2vaQTUhYG7GE6Zlo5m1ird4UP/nxSEhBNDsXVtrf/9g6AwDQML9g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:message-id:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=mm5XAsgK1sxEPPjla SW0XBNtHqmaHTEACbUmZMoJOms=; b=RSme7VmcQEigCbOmkQwIj4As8OWsBldz5 tLWCBnmFaBcFfGeQ28kGGXse2U6jF7lHUS+y3RYwDn7/EL3wOYAxd0zoNJTKxeqb pypn9amgMLWDft0fNzlCtkLZZ0QJSfo3TyR6p/GTVJDWcP/+tStu1+HuYm32anxP FEY9hhwvcg/BYsAXhAEdEQ75tE57jwa6T+KWeJalXBwhZhw98n+qZPHcwubEFaed l8oX0aetI30/hc+Ae7RH8w5InLPDApom0VIPjOpwBR8iKUuLITqApn7AivCX0qFv d+oLAvIXm5iVUEwcmSbMexT8A7SvqnmAvA7hRFwwmOWTN1bFqLnaQ== X-ME-Proxy: X-ME-Sender: From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 1/2] vcs_info git: Flatten a nested if. Date: Sat, 18 Aug 2018 15:57:18 +0000 Message-Id: <20180818155719.23574-1-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 No functional change. --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index f3dd95dcb..a44a62c79 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -104,16 +104,11 @@ VCS_INFO_git_getbranch () { elif [[ -d "${gitdir}/.dotest-merge" ]] ; then gitbranch="$(< ${gitdir}/.dotest-merge/head-name)" + elif gitbranch="$(${(z)gitsymref} 2> /dev/null)" ; then + elif gitbranch="refs/tags/$(${vcs_comm[cmd]} describe --all --exact-match HEAD 2>/dev/null)" ; then + elif gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..." ; then else - gitbranch="$(${(z)gitsymref} 2> /dev/null)" - - if [[ $? -ne 0 ]] ; then - gitbranch="refs/tags/$(${vcs_comm[cmd]} describe --all --exact-match HEAD 2>/dev/null)" - - if [[ $? -ne 0 ]] ; then - gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..." - fi - fi + # Can't happen fi return 0