From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7597 invoked by alias); 31 Jul 2017 00:59:48 -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: 41475 Received: (qmail 17823 invoked from network); 31 Jul 2017 00:59:47 -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(-0.7/5.0):. Processed in 1.6379 secs); 31 Jul 2017 00:59:47 -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=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID autolearn=unavailable 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: | Received-SPF: none (ns1.primenet.com.au: domain at daniel.shahaf.name does not designate permitted sender hosts) 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:x-sasl-enc; s=fm1; bh=gdizC7 /C+Qfe34ikURYA0KElTPNqOlMCpl8dveWpXX0=; b=XBl/LbwXp2GvdoRY/v7iRa jvsjUXJL0/oIj63xhSMOsga4EhWPOkXbONl6PKguJerLE0WivmcOVzbRU40wXTQR nvbFmF7J2MrUD4htJ7bskUuHjE4VwJm3PEI+rabCGc4iyX8YVCiI+ghjX45/n1DW gvnrSwlx7J3yR+2PSJygMF1f4FHWsbRc/12k85g3eIi2nkCSbWwtD7lCvJEltmR7 LRc+zEIQc/mrIySh5bTy+bZbcK7VQ/5p48FpCFOTB7sVZK1WbqTonwHmstZ5XFcd sZ4d4PidBLAXThrp7SrwZAfE6jUesUQOW4JotgSPldzMCktrel0o/dODOyr4jkOQ == 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:x-sasl-enc; s=fm1; bh=gdizC7 /C+Qfe34ikURYA0KElTPNqOlMCpl8dveWpXX0=; b=qW+Kgi8/neGkBB1GdIPaik eDMqZICF2FmSlf/4i5R/o8MsoWzojvKtAQ8Rl98GlPNBhvSn8ZKbDlw6GGA7dWTI jQ9WuAAl6Mx3hhhVt+1/G3i7dqlMbZlCVVMe8W+ovTarS5nyenb9pb7cNiOrw03y LKH8aXPqPGkNmBXUAlKwiG54AbGCx6mnC5WDxRz3OtaH3VmpLZFdix3oa++DwcNs LmINOmj2NTQulp07hc2E0uCj98gblNGvwkH+0pi+e8xpvi25upV0CcYX7XjCOGn3 73/uZw2HF3l20mPtbcJtEo1HFLU9g2k+tVZppz94iAlmHEgwQJHxrzxiXZedWHSA == X-ME-Sender: X-Sasl-enc: WCiHXZmLeO/3UdrgGhYiXzqKqYnUY7CEI39SFlqy4iWP 1501462780 From: Daniel Shahaf To: zsh-workers@zsh.org Subject: [PATCH] _git: Complete files after 'reset' when there are no commits, when the 'verbose' style is set. Date: Mon, 31 Jul 2017 00:59:33 +0000 Message-Id: <20170731005933.18904-1-danielsh@tarpaulin.shahaf.local2> X-Mailer: git-send-email 2.11.0 --- Completion/Unix/Command/_git | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index ce8a4049d..032cbad1e 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1462,6 +1462,12 @@ _git-reset () { case $state in (file) local tree=HEAD + if zstyle -t :completion:${curcontext}: verbose; then + if ! _call_program headed git rev-parse --verify HEAD 2>/dev/null; then + # well-known sha1 of the empty tree + tree=4b825dc642cb6eb9a060e54bf8d69288fbee4904 + fi + fi if [[ -n $line[1] ]] && __git_is_treeish $line[1]; then tree=$line[1] fi That magic value has been used by vcs_info for a while. I opted for making this conditional upon 'verbose' since this is a bit of an edge case, and forks aren't free everywhere. Cheers, Daniel