From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 28961 invoked from network); 1 Oct 2022 03:54:37 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 1 Oct 2022 03:54:37 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1664596477; b=JVb89ceqcNcEfraTb71qF83sEgONJY1Dib5pqLhTpOZFh4nOvDCVlcWKJ+fZIxontYE04/zkQe kMKTWq8KtzFJm4N9xJp+qMehHU8YN4xA+lOli3obh1E10DrtGKELoZgDlCZvvThNS8m1MqfcsX O0UwNL4+euVqOrN4NtfdPzFW4IM7HOmhxiwRPqNSw8ufFfDIRc7i6NMGZJZWNJNUEdDO79bv5B MUBJB/41qFkGFaJv0ImbqZsEV/QHV5MxzYyNAP7XUyUU92o96pk62tt+NNwqkQIrLpdiUO0b0M s1y+9Px8K6eKV+bIhbPgehaQmizdhHwbonV2KjrJLYiATA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f43.google.com) smtp.remote-ip=209.85.218.43; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1664596477; bh=4O2lPBiZc+molBne70DWPQ0dBGEAsDVyvPuzzWMoQpM=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=Z38vqh/DQOkuOdG/sEFNmiSR7Ju9BKkWlbcbxrUb9p1GzZEA1TI5VJlpN3bUZzZrHxyb83dCBg d0b1DY68JxzlbtC9mMh/cirTiM4yvV90l93jIo2UwxTZ7iPmHLPSz+dstrXaP4XQHytTvGUt7b hK5Ha0zHJi9SVCwl5qwVXTnEJC76m1YhhUNwnLQVbtA6tPMsIdNIXPxhiD7ukXnBDvB4bHM3e6 cfl+PoG2SgvEUdKnJHgJ1dkQjTwASUssNTNq2TDbBPams1uLsQ28ZorYc/kh8AXrwbVjyc5Bfm e3Q9BFqPJbXVlmhhTWYOuX90O5wIvnycTq36HL2EefvdVw==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:Cc:To:Subject:Message-ID :Date:From:In-Reply-To:References:MIME-Version:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=4O2lPBiZc+molBne70DWPQ0dBGEAsDVyvPuzzWMoQpM=; b=ds6sePWX0KoIUBs2lr4UmOB9mt 0YHpwxhpf0t/DF5dRyRIJrIleUdHVM1hUFs59v6Krw8xyT9io3c65tuwC2GfLj01F1AIHH+85WlEE damzG8QW/G83lNyBn27mtF3JJ+9qDg4pkIHWzzPna3jaRibMmuU5gDimKB71hlzujXf+2VbZwAkrL 1cWIz5STHjo+gHiIlC/jTki4X5pgb4mm53o2p69Q8r7DNwYwN14mpHE9n2mDmGdFyKW8mANRgAWRX K0MWUSofY26nv3Uiqx3oUAocLriiwax3Z1HQwUQ7ua/ztTk3pYkXWpKbea1qPzGPYciV2qZVe2iEF ghj1fnTQ==; Received: from authenticated user by zero.zsh.org with local id 1oeTaG-0000w8-0v; Sat, 01 Oct 2022 03:54:36 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f43.google.com) smtp.remote-ip=209.85.218.43; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ej1-f43.google.com ([209.85.218.43]:39826) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1oeTZx-0000ba-Qz; Sat, 01 Oct 2022 03:54:18 +0000 Received: by mail-ej1-f43.google.com with SMTP id b2so12642128eja.6 for ; Fri, 30 Sep 2022 20:54:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=4O2lPBiZc+molBne70DWPQ0dBGEAsDVyvPuzzWMoQpM=; b=PsqqInjN0wSpwOULGW+zloRLeHEDaPC5Ocf0Y9UR3INhsUkxZjSuccDFQSNYPdiTl9 RpMnJze0q4Ulh6V8VpJLH13gORPTiUFDk9spfkUmTco5J4I+sLIu3iLFoiil7D+ghUmf fw9MPXi2fW/zVZt2r3ESDePk+OtPJOAX0B8POhCVJ/6hvEoPzzpBTpZofFWw5o2q3n+q ntmqMXhVafENA1A4ZNBTWvnIOMNUGAzHsaEW36YssbYUx8EnUzL9YdcHwYMEULlOLqFl w315WelLQFIhr8wSBkRglFKv6913xUqjQ2SSoK2D3KiIN/WdCArjMNtDrOKJi9oBDPVH 3DOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=4O2lPBiZc+molBne70DWPQ0dBGEAsDVyvPuzzWMoQpM=; b=uD914iWKVhZJ4eE6rolOYxPn0Ea01qB+oeDtlefPgmLOQJdmIip6zm7t5ZbBNhjpJO ceggMMP6mm6ccGZVwnrQMo1Vx5UyS6I8ZtpCcuCqDcwHv5TRoxReyEs0073yVI0jaTXQ Rnt34D92vOj3/x42gXMb6rr55hMj+cls51qaZIhpacZ2i7V5bZ6K2BKn5Hh/FzJ5LHjt FxZdEGyD/8+c5Zsd8hZ1JZfoNMmafbl4VZbfC7APl1Df3954jKTJqko7AUvyFTG3YbXG 3U2vmMynI40ydDktySG4NIT+ufWgzTu1eY5PyeWlDJzdBytiOTqQBxzTSYxfhchoclPS H7zA== X-Gm-Message-State: ACrzQf0SBFpsanA6KBHlGBG3pSbpUowovHAQnxcN53qqrTDkt5EJxcrD nHmZcATboqeiYViQGh/2KUycziH5PeYkKmjkIhtr3A== X-Google-Smtp-Source: AMsMyM4rvCahldV1uqLR2PdKeEzLhOoplWUExTNtZuPbscvxas5od847UWp8hKEgzn5FL14YqC/BZvUPTk1jSTFXBZc= X-Received: by 2002:a17:906:58c7:b0:722:f4bf:cb75 with SMTP id e7-20020a17090658c700b00722f4bfcb75mr8402518ejs.450.1664596457160; Fri, 30 Sep 2022 20:54:17 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Bart Schaefer Date: Fri, 30 Sep 2022 20:54:05 -0700 Message-ID: Subject: [PATCH] Re: Git auto completion does not work for comparing 2 files from 2 different branches To: =?UTF-8?B?7ZWc7ZiE67mI?= Cc: Zsh hackers list Content-Type: multipart/mixed; boundary="00000000000086334605e9f110b4" X-Seq: 50714 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: --00000000000086334605e9f110b4 Content-Type: text/plain; charset="UTF-8" On Fri, Sep 30, 2022 at 5:54 PM Bart Schaefer wrote: > > Confirmed this is still the case in 5.9 -- git diff completion always > assumes you're comparing a branch to the current checkout. Any reason not to rearrange like so? --00000000000086334605e9f110b4 Content-Type: text/plain; charset="US-ASCII"; name="git-diff.txt" Content-Disposition: attachment; filename="git-diff.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l8pdqgo60 ZGlmZiAtLWdpdCBhL0NvbXBsZXRpb24vVW5peC9Db21tYW5kL19naXQgYi9Db21wbGV0aW9uL1Vu aXgvQ29tbWFuZC9fZ2l0CmluZGV4IGNlY2I4MGFjMy4uNmExYzQxNThhIDEwMDY0NAotLS0gYS9D b21wbGV0aW9uL1VuaXgvQ29tbWFuZC9fZ2l0CisrKyBiL0NvbXBsZXRpb24vVW5peC9Db21tYW5k L19naXQKQEAgLTgwOCwxOCArODA4LDYgQEAgX2dpdC1kaWZmICgpIHsKIAogICAgICAgIyBPdGhl cndpc2UsIG1vcmUgY29tcGxleCBjb25kaXRpb25zIG5lZWQgdG8gYmUgY2hlY2tlZC4KICAgICAg IGNhc2UgJENVUlJFTlQgaW4KLSAgICAgICAgKDEpCi0gICAgICAgICAgbG9jYWwgZmlsZXNfYWx0 PSdmaWxlczo6X19naXRfY2hhbmdlZC1pbi13b3JraW5nLXRyZWVfZmlsZXMnCi0gICAgICAgICAg aWYgW1sgLW4gJHtvcHRfYXJnc1soSSktLWNhY2hlZHwtLXN0YWdlZF19IF1dOyB0aGVuCi0gICAg ICAgICAgICBmaWxlc19hbHQ9J2ZpbGVzOjpfX2dpdF9jaGFuZ2VkLWluLWluZGV4X2ZpbGVzJwot ICAgICAgICAgIGZpCi0KLSAgICAgICAgICBfYWx0ZXJuYXRpdmUgXAotICAgICAgICAgICAgJ2Nv bW1pdC1yYW5nZXM6Ol9fZ2l0X2NvbW1pdF9yYW5nZXMnIFwKLSAgICAgICAgICAgICdibG9icy1h bmQtdHJlZXMtaW4tdHJlZWlzaDo6X19naXRfYmxvYnNfYW5kX3RyZWVzX2luX3RyZWVpc2gnIFwK LSAgICAgICAgICAgICRmaWxlc19hbHQgXAotICAgICAgICAgICAgJ2Jsb2JzOjpfX2dpdF9ibG9i cyAnICYmIHJldD0wCi0gICAgICAgICAgOzsKICAgICAgICAgKDIpCiAgICAgICAgICAgIyBDaGVj ayBpZiBmaXJzdCBhcmd1bWVudCBpcyBzb21ldGhpbmcgc3BlY2lhbC4gSW4gY2FzZSBvZiBjb21t aXR0aXNoIHJhbmdlcyBhbmQgY29tbWl0dGlzaHMgb2ZmZXIgYSBmdWxsIGxpc3QgY29tcGF0aWJs ZSBjb21wbGV0aW9ucy4KICAgICAgICAgICBpZiBfX2dpdF9pc19jb21taXR0aXNoX3JhbmdlICRs aW5lWzFdOyB0aGVuCkBAIC04NDEsMTAgKzgyOSwxOSBAQCBfZ2l0LWRpZmYgKCkgewogICAgICAg ICAgIGVsaWYgW1sgLW4gJHtvcHRfYXJnc1soSSktLWNhY2hlZHwtLXN0YWdlZF19IF1dOyB0aGVu CiAgICAgICAgICAgICAjIEV4YW1wbGU6IGdpdCBkaWZmIC0tY2FjaGVkIGZpbGUxIDx0YWI+CiAg ICAgICAgICAgICBfX2dpdF9jaGFuZ2VkLWluLWluZGV4X2ZpbGVzICYmIHJldD0wCi0gICAgICAg ICAgZWxzZQotICAgICAgICAgICAgIyBFeGFtcGxlOiBnaXQgZGlmZiBmaWxlMSA8dGFiPgotICAg ICAgICAgICAgX19naXRfY2hhbmdlZC1pbi13b3JraW5nLXRyZWVfZmlsZXMgJiYgcmV0PTAKICAg ICAgICAgICBmaQorICAgICAgICAgIDsmCisgICAgICAgICgxKQorICAgICAgICAgIGxvY2FsIGZp bGVzX2FsdD0nZmlsZXM6Ol9fZ2l0X2NoYW5nZWQtaW4td29ya2luZy10cmVlX2ZpbGVzJworICAg ICAgICAgIGlmIFtbIC1uICR7b3B0X2FyZ3NbKEkpLS1jYWNoZWR8LS1zdGFnZWRdfSBdXTsgdGhl bgorICAgICAgICAgICAgZmlsZXNfYWx0PSdmaWxlczo6X19naXRfY2hhbmdlZC1pbi1pbmRleF9m aWxlcycKKyAgICAgICAgICBmaQorCisgICAgICAgICAgX2FsdGVybmF0aXZlIFwKKyAgICAgICAg ICAgICdjb21taXQtcmFuZ2VzOjpfX2dpdF9jb21taXRfcmFuZ2VzJyBcCisgICAgICAgICAgICAn YmxvYnMtYW5kLXRyZWVzLWluLXRyZWVpc2g6Ol9fZ2l0X2Jsb2JzX2FuZF90cmVlc19pbl90cmVl aXNoJyBcCisgICAgICAgICAgICAkZmlsZXNfYWx0IFwKKyAgICAgICAgICAgICdibG9iczo6X19n aXRfYmxvYnMgJyAmJiByZXQ9MAogICAgICAgICAgIDs7CiAgICAgICAgICgqKQogICAgICAgICAg IGlmIF9fZ2l0X2lzX2NvbW1pdHRpc2hfcmFuZ2UgJGxpbmVbMV07IHRoZW4K --00000000000086334605e9f110b4--