From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1022 invoked by alias); 1 Jun 2014 02:27: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: X-Seq: 32644 Received: (qmail 13021 invoked from network); 1 Jun 2014 02:26:59 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=date:from:to:subject:message-id :mime-version:content-type; s=mesmtp; bh=ZIUiDUrmRRaeYMJEnYxW42c XV+8=; b=1dOUdsf51N4fEeeOj5IxJrweFbAvyrTo3MEx72yBJvKioaF6vlA4DQP P9WQ1IwtrMBmLaTWy+i1ytn1D5mpTCT3ODGPsOp2KTsuiBrrSphOfhYXkCnxLrMk tKRoURb22KR31sZYJ5gzNl7nqHJCpWKSDlTnCpTwXpKO9g57+jSk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=date:from:to:subject:message-id :mime-version:content-type; s=smtpout; bh=ZIUiDUrmRRaeYMJEnYxW42 cXV+8=; b=W0Lffh2Tm4z8gUHWM23qOi98UcosZVnhndVTB7Xl8n64u9QPZiLwqz aLC/ZPKlSIvp70r8w0+uQOFi2QjNyiHAR6W3+SuXbGpw7K8O7ETlyz+cJJlgEgeK EJkdFvS4KFEZrZlVcWQiK2Pq/qMHc5NkniImH/K3eFdA7DTaL6wPM= X-Sasl-enc: wIJR3lutBzJfQkP0UPTeYSzjiauphF+sdLhTh9D17/iG 1401589617 Date: Sun, 1 Jun 2014 02:26:53 +0000 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH] vcs_info git: Fix stagedstr for empty repos Message-ID: <20140601022653.GE1820@tarsus.local2> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="PEIAKu/WMn1b1Hv9" Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) --PEIAKu/WMn1b1Hv9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Good morning Frank, *, vcs_info git false-negatives to detect staged changes in a repository that has no commits. Attached a patch for that. The patch includes two variants for computing the "has staged changes?" bit in empty repositories: one via 'git ls-files' and one via git's empty tree. - The output of ls-files isn't O(1), but I tested with a 3000-file tree and didn't notice a slowdown, so I suppose it's acceptable. - 'diff-index --cached --quiet $empty_tree' is an O(1) operation, but I am not sure whether it is forwards compatible with future versions of Git, i.e., whether it's a hack that happens to work or a legitimate use of git's API. WDYT? Daniel --PEIAKu/WMn1b1Hv9 Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="0002-vcs_info-git-Fix-stagedstr-for-empty-repos.patch" >>From 9994132f33c5439fbb5d3c4ef91ba122b942fd7c Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Fri, 30 May 2014 23:50:55 +0000 Subject: [PATCH 2/2] vcs_info git: Fix stagedstr for empty repos In empty repositories, HEAD is an unresolvable symbolic ref. Start computing stagedstr/unstagedstr in that case; for the former, use a different method than the non-empty-repository case. --- Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index a48dc39..caf938b 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -128,16 +128,25 @@ elif zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" "check-for-staged-change querystaged=1 fi if (( querystaged || queryunstaged )) && \ - [[ "$(${vcs_comm[cmd]} rev-parse --is-inside-git-dir 2> /dev/null)" != 'true' ]] && \ - ${vcs_comm[cmd]} rev-parse --quiet --verify HEAD &> /dev/null ; then + [[ "$(${vcs_comm[cmd]} rev-parse --is-inside-work-tree 2> /dev/null)" == 'true' ]] ; then # Default: off - these are potentially expensive on big repositories if (( queryunstaged )) ; then ${vcs_comm[cmd]} diff --no-ext-diff --ignore-submodules --quiet --exit-code || gitunstaged=1 fi if (( querystaged )) ; then - ${vcs_comm[cmd]} diff-index --cached --quiet --ignore-submodules HEAD 2> /dev/null - (( $? && $? != 128 )) && gitstaged=1 + if ${vcs_comm[cmd]} rev-parse --quiet --verify HEAD &> /dev/null ; then + ${vcs_comm[cmd]} diff-index --cached --quiet --ignore-submodules HEAD 2> /dev/null + (( $? && $? != 128 )) && gitstaged=1 + else + # empty repository (no commits yet) + # TODO: ls-files' output isn't O(1); might be faster to use + # empty_tree_sha1=$(git hash-object -t tree /dev/null) + # git diff-index --cached --quiet $empty_tree_sha1 + # (( $? && $? != 128 )) + # to efficiently get the "is the index not empty?" bit. + [[ -n "$(${vcs_comm[cmd]} ls-files --cached -z)" ]] && gitstaged=1 + fi fi fi -- 1.7.10.4 --PEIAKu/WMn1b1Hv9--