From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: zsh-workers-return-43617-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 342d3db1 for ; Sun, 7 Oct 2018 17:47:15 +0000 (UTC) Received: (qmail 23027 invoked by alias); 7 Oct 2018 17:47:00 -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: 43617 Received: (qmail 27526 invoked by uid 1010); 7 Oct 2018 17:47:00 -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.028187 secs); 07 Oct 2018 17:47:00 -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=ryK35yzL3d5+T5Jt71mwyIqm3A6W/ NYRJOW63a/BFUU=; b=ku0Q94/5yU296ZZltjJ6C2PnCrRWEvEHQxD9pkqII+X0b 2T7iOnI7KLAHSEr2Sn2X2jlUpEXB/Vy/MQbIg3NWqImQmhVP8Y5Etk9tsfYEJjfl vXHBgkKH/OwymdfuwYM2K0S+3iZaw3wkmLcGfcWHU2z8Z3f0ufUDTbJqH88Gfjq1 badwUoNkxvMeplwdlvhNMVBf7eODLDJCXTNZp3wUPW0NH8ylTVlFJ9ckj2zwI8vN 60E6kGD245grp+M0qMXJUzbW9KoOL0V8CMp4/u27D2NbalMkSdj1jgsdCHH3KC0I 9nj7+ZIhHk2+7N2rDC+16/OrkdawILqMvd1gtwY4w== 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=ryK35yzL3d5+T5Jt71mwyIqm3A6W/ NYRJOW63a/BFUU=; b=higAy7shAidV/gzlCN8t7VCvGVxb+p6U9zW5UvENa+Tdd 8bLYl90tS5FGFGZZMKrM6VWfnC7vGAU/X2atKHdENW/RTiyqCzyJPOy1GjMQV1uT ohu+x7haD1srRSH1N2X+MtIivdrw7bGgjdSJFvK3zIOt3ba4FzduUInWy1iuom3H bcWd2dWymsKNDx27MOAm75B1WqSRwL4YOqwXUF3ZhM2rXnVYb9ZwZWrlxD2g4omn jnPI4kTIAbDHfQS/Cyl5kjotdidkJKqrg9L5Zn4EvHzst5vvd7snVQBf54WfZrc6 G1+2kpW6fFlhTrqGV3GXkd2pTftZbR4mI3wfJReJg== X-ME-Sender: X-ME-Proxy: From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH 3/4] vcs_info git: During a non-interactive rebase of a detached head, computer the %b expando correctly. Date: Sun, 7 Oct 2018 17:46:42 +0000 Message-Id: <20181007174643.16262-3-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> Before this commit, the value of %b was the hash of the commit from the "source" side of the rebase, from .git/rebase-apply/orig-head and .git/rebase-apply/original-commit. This broke the invariant that %b expands to a git-rev-parse(1) expression resolving to what %r expands to. Use .git/rebase-apply/onto instead as, empirically, it contains the correct value. --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index cd57902b6..8305cf41a 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -90,7 +90,7 @@ VCS_INFO_git_getbranch () { [[ -z ${gitbranch} ]] && [[ -r ${actiondir}/head-name ]] \ && gitbranch="$(< ${actiondir}/head-name)" [[ -z ${gitbranch} || ${gitbranch} == 'detached HEAD' ]] \ - && gitbranch="$(< ${gitdir}/ORIG_HEAD)" + && gitbranch="$(< ${actiondir}/onto)" elif [[ -f "${gitdir}/MERGE_HEAD" ]] ; then gitbranch="$(${(z)gitsymref} 2> /dev/null)"