From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-2.7 required=3.0 tests=AWL,BAYES_00,BODY_8BITS, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 417711F8C6 for ; Wed, 28 Jul 2021 04:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233567AbhG1EqD (ORCPT ); Wed, 28 Jul 2021 00:46:03 -0400 Received: from smtp44.hk.chengmail.me ([113.10.190.92]:54914 "EHLO smtp44.hk.chengmail.me" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232665AbhG1EqC (ORCPT ); Wed, 28 Jul 2021 00:46:02 -0400 X-CHENGMAILHOST: 113.10.190.92 X-CHENGMAIL-INSTANCEID: 4498.6100e101.e010c.0 Date: Wed, 28 Jul 2021 12:45:53 +0800 From: "lilinchao@oschina.cn" To: "jerry@skydio.com" , git , "Junio C Hamano" Cc: "jerry@skydio.com" Subject: Re: [PATCH] git-apply: fix --3way with binary patch References: X-Priority: 3 X-GUID: 9572DB7F-4010-4A5E-B837-DB83CB3D4AFE X-Has-Attach: no X-Mailer: Foxmail 7.2.19.158[cn] Mime-Version: 1.0 X-source-message-id: <2021072812445303069364@oschina.cn> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Message-ID: Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org SSBhbSBoYXBweSB0byBzZWUgdGhhdCB5b3UgZml4IHRoaXMgcHJvYmxlbSBpbiB0aW1lLgoKU29t ZSBhcHBsaWNhdGlvbiBwbGF0Zm9ybShsaWtlIEdpdGxhYiwgR2l0ZWUpIHdpbGwgdXNlICJnaXQg YXBwbHkgLS1pbmRleCB4eHgucGF0Y2giIHRvIG1lcmdlIHBhdGNoIGZpbGUsCmluIG9yZGVyIHRv IGNvbXBhdGlibGUgd2l0aCBtb3N0IHR5cGVzIG9mIGZpbGVzLCB0aGV5IHdpbGwgdXNlICItLTN3 YXkiLCBzbyDCoGFsdGhvdWdoIGFzIEp1bm8gc2FpZAoiV2UgcmVmdXNlIHRvIG1lcmdlIGJpbmFy eSBmaWxlcywgc28gSSB3b3VsZCBub3QgYmUgc3VycHJpc2VkIGlmIHdlIGZhaWxlZCB0aGUgM3dh eSBpbiB0aGlzIGNhc2UiLAp3ZSB3b3VsZCBsaWtlIGl0IHN0aWxsIGJlaGF2ZSBhcyBiZWZvcmUg dGhhdCBmYWxsaW5nIGJhY2sgdG8gbm9ybWFsIHBhdGNoIGFwcGxpY2F0aW9uLCBzbyB0aGFua3Mg YWdhaW4gdG8gZml4IHRoaXMuCgo+QmluYXJ5IHBhdGNoZXMgYXBwbGllZCB3aXRoICItLTN3YXki IHdpbGwKPmFsd2F5cyByZXR1cm4gYSBjb25mbGljdCBldmVuIGlmIHRoZSBwYXRjaAo+c2hvdWxk IGNsZWFubHkgYXBwbHkgYmVjYXVzZSB0aGUgbG93IGxldmVsCj5tZXJnZSBmdW5jdGlvbiBjb25z aWRlcnMgYWxsIGJpbmFyeSBtZXJnZXMKPndpdGhvdXQgYSB2YXJpYW50IHRvIGJlIGNvbmZsaWN0 aW5nLgo+Cj5GaXggYnkgZmFsbGluZyBiYWNrIHRvIG5vcm1hbCBwYXRjaCBhcHBsaWNhdGlvbgo+ Zm9yIGFsbCBiaW5hcnkgcGF0Y2hlcy4KPgo+QWRkIHRlc3RzIGZvciAtLTN3YXkgYW5kIG5vcm1h bCBhcHBsaWNhdGlvbnMKPm9mIGJpbmFyeSBwYXRjaGVzLgo+Cj5GaXhlczogOTIzY2Q4N2FjOCAo ImdpdC1hcHBseTogdHJ5IHRocmVld2F5IGZpcnN0IHdoZW4gIi0tM3dheSIgaXMgdXNlZCIpCj5T aWduZWQtb2ZmLWJ5OiBKZXJyeSBaaGFuZyA8amVycnlAc2t5ZGlvLmNvbT4KPi0tLQo+IGFwcGx5 LmPCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgfMKgIDMgKystCj4gdC90NDEw OC1hcHBseS10aHJlZXdheS5zaCB8IDQ1ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKwo+IDIgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigt KQo+Cj5kaWZmIC0tZ2l0IGEvYXBwbHkuYyBiL2FwcGx5LmMKPmluZGV4IDFkMmQ3ZTEyNGUuLjc4 ZTUyZjBkYzEgMTAwNjQ0Cj4tLS0gYS9hcHBseS5jCj4rKysgYi9hcHBseS5jCj5AQCAtMzYzOCw3 ICszNjM4LDggQEAgc3RhdGljIGludCBhcHBseV9kYXRhKHN0cnVjdCBhcHBseV9zdGF0ZSAqc3Rh dGUsIHN0cnVjdCBwYXRjaCAqcGF0Y2gsCj4gaWYgKGxvYWRfcHJlaW1hZ2Uoc3RhdGUsICZpbWFn ZSwgcGF0Y2gsIHN0LCBjZSkgPCAwKQo+IHJldHVybiAtMTsKPgo+LQlpZiAoIXN0YXRlLT50aHJl ZXdheSB8fCB0cnlfdGhyZWV3YXkoc3RhdGUsICZpbWFnZSwgcGF0Y2gsIHN0LCBjZSkgPCAwKSB7 Cj4rCWlmICghc3RhdGUtPnRocmVld2F5IHx8IHBhdGNoLT5pc19iaW5hcnkgfHwKPisJdHJ5X3Ro cmVld2F5KHN0YXRlLCAmaW1hZ2UsIHBhdGNoLCBzdCwgY2UpIDwgMCkgewo+IGlmIChzdGF0ZS0+ YXBwbHlfdmVyYm9zaXR5ID4gdmVyYm9zaXR5X3NpbGVudCAmJgo+IMKgwqDCoCBzdGF0ZS0+dGhy ZWV3YXkgJiYgIXBhdGNoLT5kaXJlY3RfdG9fdGhyZWV3YXkpCj4gZnByaW50ZihzdGRlcnIsIF8o IkZhbGxpbmcgYmFjayB0byBkaXJlY3QgYXBwbGljYXRpb24uLi5cbiIpKTsKPmRpZmYgLS1naXQg YS90L3Q0MTA4LWFwcGx5LXRocmVld2F5LnNoIGIvdC90NDEwOC1hcHBseS10aHJlZXdheS5zaAo+ aW5kZXggNjUxNDdlZmRlYS4uZDMyNzQ4Zjg5OSAxMDA3NTUKPi0tLSBhL3QvdDQxMDgtYXBwbHkt dGhyZWV3YXkuc2gKPisrKyBiL3QvdDQxMDgtYXBwbHktdGhyZWV3YXkuc2gKPkBAIC0yMzAsNCAr MjMwLDQ5IEBAIHRlc3RfZXhwZWN0X3N1Y2Nlc3MgJ2FwcGx5IHdpdGggLS0zd2F5IC0tY2FjaGVk IGFuZCBjb25mbGljdHMnICcKPiB0ZXN0X2NtcCBleHBlY3QuZGlmZiBhY3R1YWwuZGlmZgo+ICcK Pgo+K3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ2FwcGx5IGJpbmFyeSBmaWxlIHBhdGNoJyAnCj4rCWdp dCByZXNldCAtLWhhcmQgbWFpbiAmJgo+KwljcCAkVEVTVF9ESVJFQ1RPUlkvdGVzdC1iaW5hcnkt MS5wbmcgYmluLnBuZyAmJgo+KwlnaXQgYWRkIGJpbi5wbmcgJiYKPisJZ2l0IGNvbW1pdCAtbSAi YWRkIGJpbmFyeSBmaWxlIiAmJgo+Kwo+KwljcCAkVEVTVF9ESVJFQ1RPUlkvdGVzdC1iaW5hcnkt Mi5wbmcgYmluLnBuZyAmJgo+Kwo+KwlnaXQgZGlmZiAtLWJpbmFyeSA+YmluLmRpZmYgJiYKPisJ Z2l0IHJlc2V0IC0taGFyZCAmJgo+Kwo+KwkjIEFwcGx5IG11c3Qgc3VjY2VlZC4KPisJZ2l0IGFw cGx5IGJpbi5kaWZmCj4rJwo+Kwo+K3Rlc3RfZXhwZWN0X3N1Y2Nlc3MgJ2FwcGx5IGJpbmFyeSBm aWxlIHBhdGNoIHdpdGggM3dheScgJwo+KwlnaXQgcmVzZXQgLS1oYXJkIG1haW4gJiYKPisJY3Ag JFRFU1RfRElSRUNUT1JZL3Rlc3QtYmluYXJ5LTEucG5nIGJpbi5wbmcgJiYKPisJZ2l0IGFkZCBi aW4ucG5nICYmCj4rCWdpdCBjb21taXQgLW0gImFkZCBiaW5hcnkgZmlsZSIgJiYKPisKPisJY3Ag JFRFU1RfRElSRUNUT1JZL3Rlc3QtYmluYXJ5LTIucG5nIGJpbi5wbmcgJiYKPisKPisJZ2l0IGRp ZmYgLS1iaW5hcnkgPmJpbi5kaWZmICYmCj4rCWdpdCByZXNldCAtLWhhcmQgJiYKPisKPisJIyBB cHBseSBtdXN0IHN1Y2NlZWQuCj4rCWdpdCBhcHBseSAtLTN3YXkgLS1pbmRleCBiaW4uZGlmZgo+ KycKPisKPit0ZXN0X2V4cGVjdF9zdWNjZXNzICdhcHBseSBmdWxsLWluZGV4IHBhdGNoIHdpdGgg M3dheScgJwo+KwlnaXQgcmVzZXQgLS1oYXJkIG1haW4gJiYKPisJY3AgJFRFU1RfRElSRUNUT1JZ L3Rlc3QtYmluYXJ5LTEucG5nIGJpbi5wbmcgJiYKPisJZ2l0IGFkZCBiaW4ucG5nICYmCj4rCWdp dCBjb21taXQgLW0gImFkZCBiaW5hcnkgZmlsZSIgJiYKPisKPisJY3AgJFRFU1RfRElSRUNUT1JZ L3Rlc3QtYmluYXJ5LTIucG5nIGJpbi5wbmcgJiYKPisKPisJZ2l0IGRpZmYgLS1mdWxsLWluZGV4 ID5iaW4uZGlmZiAmJgo+KwlnaXQgcmVzZXQgLS1oYXJkICYmCj4rCj4rCSMgQXBwbHkgbXVzdCBz dWNjZWVkLgo+KwlnaXQgYXBwbHkgLS0zd2F5IC0taW5kZXggYmluLmRpZmYKPisnCj4rCj4gdGVz dF9kb25lCj4tLQo+Mi4zMi4wLjEzMTQuZzZlZDRmY2M0Y2MKPg==