From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12192 invoked by alias); 30 Nov 2015 03:32:26 -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: X-Seq: 37252 Received: (qmail 2377 invoked from network); 30 Nov 2015 03:32:25 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=0oO Huh4ZQWacqwqi2/wPpRYk3a4=; b=jTzHv7r68blsdtmBomGd9l2EoCqRDCg/Dn1 cdTm5ZvArDxH1Fx9rw2nXi1NNVfMmYBxb2e3euK7MzxEiO8BxHL/Lf9tEFqn3Net VMkmLFk5Lt+YXrfjb0O+pJKG0AREeZxe9Bxs7JOQN4PAxIVLoUFbVMQt2WSV7oIU OIRKNUM0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=0o OHuh4ZQWacqwqi2/wPpRYk3a4=; b=MZMXZa8RyQhtkHABLe38w8+dmuR8vaqsYP 9W/TTCAluHa0lHr7fxVpa89xCBGOQdLWXirdMcA+7c7QMQNrth/wow1ILvfRlCCM QT0oNGcrQY1p6yhcFGuaiH+U+mbs9/Vkpexor4XXrxDUDFaxCPtoe7Qewr/tW3p/ d44sR8rJw= X-Sasl-enc: 4UMH0ezrBx1LfvhsSCw0Bo6DhU75mM57ZRnSwNoSjcVV 1448853839 Date: Mon, 30 Nov 2015 03:23:57 +0000 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH] vcs_info git: Compute %b correctly with "rebase --onto" of detached heads. (Follow-up to 36725.) Message-ID: <20151130032357.GI2504@tarsus.local2> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) --- Besides .git/ORIG_HEAD there is also .git/rebase-apply/orig-head, I'm not sure if one of those should be preferred over the other. Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 3 ++- 1 file changed, 2 insertions(+), 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 704c189..e1cee74 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -87,7 +87,8 @@ VCS_INFO_git_getbranch () { gitbranch="$(${(z)gitsymref} 2> /dev/null)" [[ -z ${gitbranch} ]] && [[ -r ${actiondir}/head-name ]] \ && gitbranch="$(< ${actiondir}/head-name)" - [[ -z ${gitbranch} ]] && gitbranch="$(< ${gitdir}/ORIG_HEAD)" + [[ -z ${gitbranch} || ${gitbranch} == 'detached HEAD' ]] \ + && gitbranch="$(< ${gitdir}/ORIG_HEAD)" elif [[ -f "${gitdir}/MERGE_HEAD" ]] ; then gitbranch="$(${(z)gitsymref} 2> /dev/null)" -- 2.1.4