From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16217 invoked by alias); 29 Aug 2015 16:54:04 -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: 36328 Received: (qmail 26543 invoked from network); 29 Aug 2015 16:54:03 -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=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=loiPqyiIAxA+4RxasISamCNpA+5MsyfuEC+Xokw2nCQ=; b=Vmneihs1eDQcjQhKRU0A/KCgdMABxGnIUapz31aRns3+fkq7bLF/7OxN8CNW7QzQYN hHMyzmdRxpeZj4g4SB844krInm4x04R+Fv8vY+tBuRYZ1Q485P9n1uidnhsaobAfn9ya pnSjpeBQw/qwwb+4M3V3BRBDVWN26aUrRnlinnBC29N7aF6xkR4fpeFObJk0BoUl3ecm hz/006PfDVb8XEzKJz9tjeGTLfRkSubYaxrELe+4HTPz4vB46QgP2QfUc+JehxVisYx0 5J4WiRl/n73zi5pzvRsbYOpdomwK5MV0UWJna99BnADqyoNqihvg+HaGxCMZP3f4dM/J t5Vw== MIME-Version: 1.0 X-Received: by 10.140.151.5 with SMTP id 5mr26877676qhx.27.1440867237699; Sat, 29 Aug 2015 09:53:57 -0700 (PDT) In-Reply-To: <20150827232856.GF21994@tarsus.local2> References: <20150722115307.GC2171@tarsus.local2> <20150827231152.GD21994@tarsus.local2> <150827161952.ZM1496@torch.brasslantern.com> <20150827232856.GF21994@tarsus.local2> Date: Sat, 29 Aug 2015 17:53:57 +0100 Message-ID: Subject: Re: PATCH: 3.0.8: git completion update for cherry-pick From: Mateusz Karbowy To: Daniel Shahaf Cc: Bart Schaefer , zsh-workers@zsh.org Content-Type: multipart/mixed; boundary=001a11352750df7ed2051e760b33 --001a11352750df7ed2051e760b33 Content-Type: text/plain; charset=UTF-8 Daniel, I've fixed the no-quotes issue with $@ and now I'm passing both compadd and git commit options using one -O parameter (the array names are separated with colon, as you suggested). Regards, Obszczymucha On 28 August 2015 at 00:28, Daniel Shahaf wrote: > Bart Schaefer wrote on Thu, Aug 27, 2015 at 16:19:52 -0700: >> On Aug 27, 11:11pm, Daniel Shahaf wrote: >> } >> } Apart from these two issues, the patch seems ready for commit to me. >> >> Let's get this (and 36304) in soon, so PWS can close -test-3 and >> release 5.1. > > I've already pushed 36304. > > I don't think this patch needs to delay 5.1; it's not a regression. --001a11352750df7ed2051e760b33 Content-Type: text/plain; charset=US-ASCII; name="_git.patch.txt" Content-Disposition: attachment; filename="_git.patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_idxb4n1y0 ZGlmZiAtLWdpdCBhL0NvbXBsZXRpb24vVW5peC9Db21tYW5kL19naXQgYi9Db21wbGV0aW9uL1Vu aXgvQ29tbWFuZC9fZ2l0CmluZGV4IGI4ZWRjMTAuLmVmMTI1ZTQgMTAwNjQ0Ci0tLSBhL0NvbXBs ZXRpb24vVW5peC9Db21tYW5kL19naXQKKysrIGIvQ29tcGxldGlvbi9Vbml4L0NvbW1hbmQvX2dp dApAQCAtNDk1LDYgKzQ5NSw4IEBAIF9naXQtY2hlY2tvdXQgKCkgewogCiAoKCAkK2Z1bmN0aW9u c1tfZ2l0LWNoZXJyeS1waWNrXSApKSB8fAogX2dpdC1jaGVycnktcGljayAoKSB7CisgIGxvY2Fs IC1hIGdpdF9jb21taXRfb3B0cworICBnaXRfY29tbWl0X29wdHM9KC0tYWxsIC0tbm90IEhFQUQg LS1ub3QpCiAgIF9hcmd1bWVudHMgXAogICAgICcoLSA6KS0tcXVpdFtlbmQgcmV2ZXJ0IG9yIGNo ZXJyeS1waWNrIHNlcXVlbmNlXScgXAogICAgICcoLSA6KS0tY29udGludWVbcmVzdW1lIHJldmVy dCBvciBjaGVycnktcGljayBzZXF1ZW5jZV0nIFwKQEAgLTUxMSw3ICs1MTMsNyBAQCBfZ2l0LWNo ZXJyeS1waWNrICgpIHsKICAgICAnKid7LXMsLS1zdHJhdGVneT19J1t1c2UgZ2l2ZW4gbWVyZ2Ug c3RyYXRlZ3ldOm1lcmdlIHN0cmF0ZWd5Ol9fZ2l0X21lcmdlX3N0cmF0ZWdpZXMnIFwKICAgICAn Kid7LVgsLS1zdHJhdGVneS1vcHRpb249fSdbcGFzcyBtZXJnZS1zdHJhdGVneS1zcGVjaWZpYyBv cHRpb24gdG8gbWVyZ2Ugc3RyYXRlZ3ldJyBcCiAgICAgJygtZSAtLWVkaXQgLXggLW4gLS1uby1j b21taXQgLXMgLS1zaWdub2ZmKS0tZmZbZmFzdCBmb3J3YXJkLCBpZiBwb3NzaWJsZV0nIFwKLSAg ICAnOiA6X19naXRfY29tbWl0X3JhbmdlcycKKyAgICAnOiA6IF9fZ2l0X2NvbW1pdF9yYW5nZXMg LU8gZXhwbDpnaXRfY29tbWl0X29wdHMnCiB9CiAKICgoICQrZnVuY3Rpb25zW19naXQtY2l0b29s XSApKSB8fApAQCAtNTYwMiwyMCArNTYwNCwyOCBAQCBfX2dpdF9yZW1vdGVfYnJhbmNoX25hbWVz X25vcHJlZml4ICgpIHsKIAogKCggJCtmdW5jdGlvbnNbX19naXRfY29tbWl0X29iamVjdHNfcHJl ZmVyX3JlY2VudF0gKSkgfHwKIF9fZ2l0X2NvbW1pdF9vYmplY3RzX3ByZWZlcl9yZWNlbnQgKCkg ewotICBfX2dpdF9yZWNlbnRfY29tbWl0cyB8fCBfX2dpdF9jb21taXRfb2JqZWN0cworICBsb2Nh bCAtYSBhcmd1bWVudF9hcnJheV9uYW1lcworICB6cGFyc2VvcHRzIC1EIC1FIE86PWFyZ3VtZW50 X2FycmF5X25hbWVzCisKKyAgX19naXRfcmVjZW50X2NvbW1pdHMgJGFyZ3VtZW50X2FycmF5X25h bWVzIHx8IF9fZ2l0X2NvbW1pdF9vYmplY3RzCiB9CiAKICgoICQrZnVuY3Rpb25zW19fZ2l0X2Nv bW1pdHNdICkpIHx8CiBfX2dpdF9jb21taXRzICgpIHsKKyAgbG9jYWwgLWEgYXJndW1lbnRfYXJy YXlfbmFtZXMKKyAgenBhcnNlb3B0cyAtRCAtRSBPOj1hcmd1bWVudF9hcnJheV9uYW1lcworICAo KCAkI2FyZ3VtZW50X2FycmF5X25hbWVzICkpICYmIGFyZ3VtZW50X2FycmF5X25hbWVzPSggIiR7 KEBzLzovKWFyZ3VtZW50X2FycmF5X25hbWVzWzJdfSIgKSAmJiBzZXQgLS0gIiR7KEBQKWFyZ3Vt ZW50X2FycmF5X25hbWVzWzFdfSIKKwogICAjIFRPRE86IGRlYWwgd2l0aCB0aGluZ3MgdGhhdCBf X2dpdF9oZWFkcyBhbmQgX19naXRfdGFncyBoYXMgaW4gY29tbW9uIChpLmUuLAogICAjIGlmIGJv dGggZXhpc3RzLCB0aGV5IG5lZWQgdG8gYmUgY29tcGxldGVkIHRvIGhlYWRzL3ggYW5kIHRhZ3Mv eC4KLSAgbG9jYWwgLWEgc29wdHMgcm9wdAorICBsb2NhbCAtYSBzb3B0cyByb3B0IGV4cGwKICAg enBhcnNlb3B0cyAtRSAtYSBzb3B0cyBTOiByOj1yb3B0IFI6IHEKICAgc29wdHMrPSggJHJvcHQ6 cSApCisgIGV4cGw9KCAiJEAiICkKICAgX2FsdGVybmF0aXZlIFwKICAgICAiaGVhZHM6Ol9fZ2l0 X2hlYWRzICRzb3B0cyIgXAogICAgICJjb21taXQtdGFnczo6X19naXRfY29tbWl0X3RhZ3MgJHNv cHRzIiBcCi0gICAgJ2NvbW1pdC1vYmplY3RzOjpfX2dpdF9jb21taXRfb2JqZWN0c19wcmVmZXJf cmVjZW50JworICAgICdjb21taXQtb2JqZWN0czo6IF9fZ2l0X2NvbW1pdF9vYmplY3RzX3ByZWZl cl9yZWNlbnQgLU8gZXhwbDokYXJndW1lbnRfYXJyYXlfbmFtZXNbMl0nCiB9CiAKICgoICQrZnVu Y3Rpb25zW19fZ2l0X2hlYWRzXSApKSB8fApAQCAtNTY3MCwxMyArNTY4MCwxNyBAQCBfX2dpdF9j b21taXRfb2JqZWN0cyAoKSB7CiAoKCAkK2Z1bmN0aW9uc1tfX2dpdF9yZWNlbnRfY29tbWl0c10g KSkgfHwKIF9fZ2l0X3JlY2VudF9jb21taXRzICgpIHsKICAgbG9jYWwgZ2l0ZGlyIGV4cGwgc3Rh cnQKLSAgZGVjbGFyZSAtYSBkZXNjciB0YWdzIGhlYWRzIGNvbW1pdHMKKyAgZGVjbGFyZSAtYSBk ZXNjciB0YWdzIGhlYWRzIGNvbW1pdHMgYXJndW1lbnRfYXJyYXlfbmFtZXMgY29tbWl0X29wdHMK ICAgbG9jYWwgaSBqIGsgcmV0CiAgIGludGVnZXIgZGlzdGFuY2VfZnJvbV9oZWFkCiAKKyAgenBh cnNlb3B0cyAtRCAtRSBPOj1hcmd1bWVudF9hcnJheV9uYW1lcworICAoKCAkI2FyZ3VtZW50X2Fy cmF5X25hbWVzICkpICYmIGFyZ3VtZW50X2FycmF5X25hbWVzPSggIiR7KEBzLzovKWFyZ3VtZW50 X2FycmF5X25hbWVzWzJdfSIgKQorICAoKCAkI2FyZ3VtZW50X2FycmF5X25hbWVzID4gMSApKSAm JiBjb21taXRfb3B0cz0oICIkeyhAUClhcmd1bWVudF9hcnJheV9uYW1lc1syXX0iICkKKwogICAj IENhcmVmdWw6IG1vc3QgJWQgd2lsbCBleHBhbmQgdG8gdGhlIGVtcHR5IHN0cmluZy4gIFF1b3Rl IHByb3Blcmx5IQogICAjIE5PVEU6IHdlIGNvdWxkIHVzZSAlRCBkaXJlY3RseSwgYnV0IGl0J3Mg bm90IGF2YWlsYWJsZSBpbiBnaXQgMS45LjEgYXQgbGVhc3QuCi0gIGNvbW1pdHM9KCIkeyhmKSIk KF9jYWxsX3Byb2dyYW0gY29tbWl0cyBnaXQgLS1uby1wYWdlciBsb2cgLTIwIC0tZm9ybWF0PScl aCVuJWQlbiVzXCBcKCVjclwpJykifSIpCisgIGNvbW1pdHM9KCIkeyhmKSIkKF9jYWxsX3Byb2dy YW0gY29tbWl0cyBnaXQgLS1uby1wYWdlciBsb2cgJGNvbW1pdF9vcHRzIC0yMCAtLWZvcm1hdD0n JWglbiVkJW4lc1wgXCglY3JcKScpIn0iKQogICBfX2dpdF9jb21tYW5kX3N1Y2Nlc3NmdWwgJHBp cGVzdGF0dXMgfHwgcmV0dXJuIDEKIAogICBmb3IgaSBqIGsgaW4gIiRjb21taXRzW0BdIiA7IGRv CkBAIC01NzU5LDEzICs1NzczLDE5IEBAIF9fZ2l0X2NvbW1pdHMyICgpIHsKIAogKCggJCtmdW5j dGlvbnNbX19naXRfY29tbWl0X3Jhbmdlc10gKSkgfHwKIF9fZ2l0X2NvbW1pdF9yYW5nZXMgKCkg ewotICBsb2NhbCAtYSBzdWYKKyAgbG9jYWwgLWEgYXJndW1lbnRfYXJyYXlfbmFtZXMKKyAgenBh cnNlb3B0cyAtRCAtRSBPOj1hcmd1bWVudF9hcnJheV9uYW1lcworICAoKCAkI2FyZ3VtZW50X2Fy cmF5X25hbWVzICkpICYmIGFyZ3VtZW50X2FycmF5X25hbWVzPSggIiR7KEBzLzovKWFyZ3VtZW50 X2FycmF5X25hbWVzWzJdfSIgKSAmJiBzZXQgLS0gIiR7KEBQKWFyZ3VtZW50X2FycmF5X25hbWVz WzFdfSIKKworICBsb2NhbCAtYSBleHBsIHN1ZgogICBpZiBjb21wc2V0IC1QICcqLi4oLnwpJzsg dGhlbgotICAgIF9fZ2l0X2NvbW1pdHMgJCoKKyAgICBleHBsPSggJCogKQogICBlbHNlCiAgICAg Y29tcHNldCAtUyAnLi4qJyB8fCBzdWY9KCAtUyAuLiAtciAnLkB+IF46XHRcblwtJyApCi0gICAg X19naXRfY29tbWl0cyAkKiAkc3VmCisgICAgZXhwbD0oICQqICRzdWYgKQogICBmaQorCisgIF9f Z2l0X2NvbW1pdHMgLU8gZXhwbDokYXJndW1lbnRfYXJyYXlfbmFtZXNbMl0KIH0KIAogKCggJCtm dW5jdGlvbnNbX19naXRfY29tbWl0X3JhbmdlczJdICkpIHx8Cg== --001a11352750df7ed2051e760b33--