From patchwork Tue Jan 29 19:38:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787209 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4346B1399 for ; Tue, 29 Jan 2019 20:11:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3286C2958C for ; Tue, 29 Jan 2019 20:11:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24B752D53C; Tue, 29 Jan 2019 20:11:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDF492958C for ; Tue, 29 Jan 2019 20:11:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727545AbfA2UL2 (ORCPT ); Tue, 29 Jan 2019 15:11:28 -0500 Received: from nwk-aaemail-lapp02.apple.com ([17.151.62.67]:41422 "EHLO nwk-aaemail-lapp02.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727308AbfA2UL2 (ORCPT ); Tue, 29 Jan 2019 15:11:28 -0500 Received: from pps.filterd (nwk-aaemail-lapp02.apple.com [127.0.0.1]) by nwk-aaemail-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb83b031166; Tue, 29 Jan 2019 11:39:36 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=DXRiCrzSEhf91aFLDqtfI8M2B1WdL1Taew3+ObaM6fc=; b=U6wAeRDGodnsUjzGuqp7FVv2bSGNvHeQBEDS6WfYq+35oYsPjQPauopAQbT0sIMLxzAy 6cBVtbxF8h8r7Mo5WnWn4ghN6fsBmilBAJWDXY9kRRj70W1MWqQwE0KzBNcSto32MhcP ViRYcsSptZ6s8EG05gdbJ8UEwldnrzmIYTOk3E/Ulv93HoDctFRYuiefX71YPu6cTOCL ncv0E5u0s38vWj9kujxZeDJbyEQscEBSZ+B854K2jRX+fDgyEio2yoLaiHIYO7nNKw5X zZRU1mop8F1mvV259tmFSkRuoqprNrRZP2M21HeXacQUNm96uCVKt/4k/Eav1ZpobVXG aw== Received: from mr2-mtap-s03.rno.apple.com (mr2-mtap-s03.rno.apple.com [17.179.226.135]) by nwk-aaemail-lapp02.apple.com with ESMTP id 2q8n0rt9d8-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:35 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by mr2-mtap-s03.rno.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300AIKYLYUZD0@mr2-mtap-s03.rno.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9OJD00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: e70b9e81c7dd0d8bdd4b8cd74cb14219 X-Va-R-CD: 209ccd1b7deb1b907f528f41d804ce87 X-Va-CD: 0 X-Va-ID: c301508e-79df-435f-8796-642107d44b16 X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: e70b9e81c7dd0d8bdd4b8cd74cb14219 X-V-R-CD: 209ccd1b7deb1b907f528f41d804ce87 X-V-CD: 0 X-V-ID: f01f3424-9915-41f7-86e5-a0ab6407df08 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300000YJS3N00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem Date: Tue, 29 Jan 2019 11:38:07 -0800 Message-id: <20190129193818.8645-2-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This was causing problems with ppc/sha1ppc.S Signed-off-by: Jeremy Huddleston Sequoia --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0d77ea5894..a5db584576 100644 --- a/.gitignore +++ b/.gitignore @@ -195,7 +195,7 @@ *.deb /git.spec *.exe -*.[aos] +*.[ao] *.py[co] .depend/ *.gcda From patchwork Tue Jan 29 19:38:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787285 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF09C1399 for ; Tue, 29 Jan 2019 22:05:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD9072C96D for ; Tue, 29 Jan 2019 22:05:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0D332D093; Tue, 29 Jan 2019 22:05:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D3252D072 for ; Tue, 29 Jan 2019 22:05:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727545AbfA2WFa (ORCPT ); Tue, 29 Jan 2019 17:05:30 -0500 Received: from nwk-aaemail-lapp03.apple.com ([17.151.62.68]:38270 "EHLO nwk-aaemail-lapp03.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727342AbfA2WFa (ORCPT ); Tue, 29 Jan 2019 17:05:30 -0500 Received: from pps.filterd (nwk-aaemail-lapp03.apple.com [127.0.0.1]) by nwk-aaemail-lapp03.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb9fX006222; Tue, 29 Jan 2019 11:39:35 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=OkcgExc0u9gbjB3NldZmZaqRJllXmWp5Q445VgQsTEk=; b=BpaNAJX41FuMG7k+YotuPqfHKtc2PLANcuAb/KEwA/87lXIiynWclBEZg+QM66k1fQ2y GWxhagoYXcvo9u8eqZuPdoSJ+Xu0wfCch7FwpfeYWBWsS1viMed5eEv6I676CwXI8BlE 2TW6tJzTeRfTsOWSrPc5DyjYNnkG1CI7H8+Bgb3KlyzZnGPG7fPyf5Z5a7ePSpPbc+nn KBrvDdGpBwwLdmHx3KzZ1QWH94PJ5bo4xyj/iq1YZ6HDLrSQmTg3uSqcSNGAOJ2EMxSG XWbIJlgsl5H2oImx2UHRZIUjVN82j9pOWCY7xYZEuRGgZrNnU3Zx64exexFnviyOjMfJ gA== Received: from ma1-mtap-s01.corp.apple.com (ma1-mtap-s01.corp.apple.com [17.40.76.5]) by nwk-aaemail-lapp03.apple.com with ESMTP id 2q9832j51y-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:35 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by ma1-mtap-s01.corp.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300G47YLXUYE0@ma1-mtap-s01.corp.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300C00Y9IPB00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: d85662c2693cab3d0081332caa201860 X-Va-R-CD: 53a156bc41a6baf29217e9ff01f61863 X-Va-CD: 0 X-Va-ID: 9f86d6d0-a97c-448f-801d-fd4675a8131e X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: d85662c2693cab3d0081332caa201860 X-V-R-CD: 53a156bc41a6baf29217e9ff01f61863 X-V-CD: 0 X-V-ID: 9f785264-dd25-49c4-9bc8-987f0910054f Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300000YJS3N00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 02/13] test-lib: Export PERL5LIB for testing git-svn Date: Tue, 29 Jan 2019 11:38:08 -0800 Message-id: <20190129193818.8645-3-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jeremy Huddleston Sequoia --- t/test-lib.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/t/test-lib.sh b/t/test-lib.sh index 0f1faa24b2..4060a53f56 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1017,6 +1017,9 @@ fi GITPERLLIB="$GIT_BUILD_DIR"/perl/build/lib export GITPERLLIB +PERL_VERSION=$(grep DEFAULT /usr/local/versioner/perl/versions | sed 's:^.*= *\([^ ]*\)$:\1:') +PERL5LIB="$GIT_BUILD_DIR"/perl:"$(xcode-select -p)"/Library/Perl/$PERL_VERSION +export PERL5LIB test -d "$GIT_BUILD_DIR"/templates/blt || { error "You haven't built things yet, have you?" } From patchwork Tue Jan 29 19:38:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787251 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F098184E for ; Tue, 29 Jan 2019 21:19:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66CBE2C7C8 for ; Tue, 29 Jan 2019 21:19:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5888F2CD2E; Tue, 29 Jan 2019 21:19:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51FAD2C7C8 for ; Tue, 29 Jan 2019 21:19:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729176AbfA2VTP (ORCPT ); Tue, 29 Jan 2019 16:19:15 -0500 Received: from nwk-aaemail-lapp03.apple.com ([17.151.62.68]:49856 "EHLO nwk-aaemail-lapp03.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727488AbfA2VTP (ORCPT ); Tue, 29 Jan 2019 16:19:15 -0500 Received: from pps.filterd (nwk-aaemail-lapp03.apple.com [127.0.0.1]) by nwk-aaemail-lapp03.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb9fZ006222; Tue, 29 Jan 2019 11:39:36 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=M590GK2Vu9r+g0hLsDJzDkY5ClZQpEvC/8+KOESX+OA=; b=IYPQ/UqyYyqXzPmODCTRQ6r5JUdNK/DPVh+M2mIAD+NMTcDoYe1brZKH/F60nmqki86Z onXb6Ns0wnOP+2LtkNA9N0ElhPCffr+c0jRXDcii879tjSHlQUTf6NT1Dkc6bhy5693G IxQgJ5LzAoHKy13JIfp0m+TpO1xshQKnM2SrPXbwe+PfIy3a45x7dW3emZH3ZUa42jxM SGqQ+2PNRL2RBR4BMeVQFXK5idpveCG2tXAsjUF0+Gui9J3tuVEO+ayB0jZBcEpiKniq /HsIHz65Co++pZPFW7Gay4jlhvZ7mVCN2NTv1n2DQD9X6d6mGBTPgzCFolDzrUTJmRlC Ug== Received: from ma1-mtap-s01.corp.apple.com (ma1-mtap-s01.corp.apple.com [17.40.76.5]) by nwk-aaemail-lapp03.apple.com with ESMTP id 2q9832j51y-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:36 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by ma1-mtap-s01.corp.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300G47YLXUYE0@ma1-mtap-s01.corp.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9PJK00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: 8e0fa9800c58351f1c85d9dbec811360 X-Va-R-CD: f1724aed3bccb82585006345fc1fd7ab X-Va-CD: 0 X-Va-ID: fee1f0b0-06cc-49bc-a679-23b131f6f829 X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: 8e0fa9800c58351f1c85d9dbec811360 X-V-R-CD: f1724aed3bccb82585006345fc1fd7ab X-V-CD: 0 X-V-ID: 6b7cc972-e4fb-4bff-b647-8f82312ef5a4 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300000YJS3N00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 03/13] t0500: New regression test for git add of a path that contains a .git directory Date: Tue, 29 Jan 2019 11:38:09 -0800 Message-id: <20190129193818.8645-4-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jeremy Huddleston Sequoia --- t/t0500-apple.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100755 t/t0500-apple.sh diff --git a/t/t0500-apple.sh b/t/t0500-apple.sh new file mode 100755 index 0000000000..d5f79237a8 --- /dev/null +++ b/t/t0500-apple.sh @@ -0,0 +1,40 @@ +#!/bin/sh +# +# Copyright (c) 2012-2016 Apple Inc. +# +# Tests for regressions found by Apple Inc. for issues that upstream does not +# want to fix or accept tests for. + + +test_description='Apple Inc. specific tests' + +. ./test-lib.sh + +TESTROOT=$(pwd) + +# +# +# This test case addresses a regression introduced between v1.7.3 and v1.7.5 +# git bisect good v1.7.3 +# git bisect bad v1.7.5 +# ... +# found 18e051a3981f38db08521bb61ccf7e4571335353 + +test_expect_success ' -- git add of a path that contains a .git directory' ' + rm -rf .git && + mkdir -p orig/sub/dir/otherdir && + cd orig/sub && + echo "1" > dir/file && + echo "2" > dir/otherdir/file && + git init --quiet && + git add -A && + git commit -m "Initial Commit" --quiet && + cd - > /dev/null && + git init --bare --quiet "${TESTROOT}/git_dir.git" && + git --git-dir="${TESTROOT}/git_dir.git" --work-tree=/ add -f -- "${TESTROOT}/orig/sub/" && + git --git-dir="${TESTROOT}/git_dir.git" --work-tree=/ add -f -- "${TESTROOT}/orig/" && + git --git-dir="${TESTROOT}/git_dir.git" --work-tree=/ commit -m "Commit." | + grep -q "2 files changed, 2 insertions" +' + +test_done From patchwork Tue Jan 29 19:38:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787219 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F216614E1 for ; Tue, 29 Jan 2019 20:35:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E280A2D694 for ; Tue, 29 Jan 2019 20:35:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D66C22DA79; Tue, 29 Jan 2019 20:35:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54B182D694 for ; Tue, 29 Jan 2019 20:35:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727545AbfA2UfY (ORCPT ); Tue, 29 Jan 2019 15:35:24 -0500 Received: from nwk-aaemail-lapp03.apple.com ([17.151.62.68]:43320 "EHLO nwk-aaemail-lapp03.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727075AbfA2UfY (ORCPT ); Tue, 29 Jan 2019 15:35:24 -0500 Received: from pps.filterd (nwk-aaemail-lapp03.apple.com [127.0.0.1]) by nwk-aaemail-lapp03.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb9fa006222; Tue, 29 Jan 2019 11:39:36 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=CY6Lj83Du/X9ZjVXtvHHMGqMp/0daiRQ3es8KLCCxX8=; b=v6IW3j78ngdyRPTVED5+FlLjV/K+c6c526MesfC4GCIC+khdGkulzTN1vW7rgGRlft06 H2LxrK6ApjfJ9ypctQDbN40rsbRCdyXOMKTTcpniqfpU9hcVuD/DVDg2GDvinmORWhEC R1do+whReRxKOO5E6e78ps5H0nqIKQmKPEj9GDdSjZ32D7o2KuYNMKJwATj87F9xZKiJ tpqDYOEJuxDp0iuCMcIbNXh2efvtVR3v59n6mXNvAdi6IcU5GfR+MiYzpaZua+0Oqa+b 3vmHGgzYd7sIa4ZCzJI4L6fwR6bgdRuExWKV9/AiOSrYi4+QS0Pb01RzFU9FLNTEslAV ag== Received: from ma1-mtap-s01.corp.apple.com (ma1-mtap-s01.corp.apple.com [17.40.76.5]) by nwk-aaemail-lapp03.apple.com with ESMTP id 2q9832j51y-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:36 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by ma1-mtap-s01.corp.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300G47YLXUYE0@ma1-mtap-s01.corp.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9PJK00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: 0e5cfef7aac8346953b9adf4823fed9f X-Va-R-CD: 75db5ea542c87c0de9a6cb261374d43a X-Va-CD: 0 X-Va-ID: ae792ca6-b9c0-4379-8c3e-8ef19930bc51 X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: 0e5cfef7aac8346953b9adf4823fed9f X-V-R-CD: 75db5ea542c87c0de9a6cb261374d43a X-V-CD: 0 X-V-ID: afa53a10-1c1f-4bc5-8daf-5e82bb2e0f48 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300000YJS3N00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:34 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia , Josh Triplett Subject: [PATCH (Apple Git) 04/13] t4014: git --version can have SP in it Date: Tue, 29 Jan 2019 11:38:10 -0800 Message-id: <20190129193818.8645-5-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 480871e09e ("format-patch: show base info before email signature", 2016-09-07) added a helper function to recreate the signature at the end of the e-mail, i.e. "-- " line followed by the version string of Git, using output from "git --version" and stripping everything before the last SP. Because the default Git version string looks like "git version 2.10.0-1-g480871e09e", this was mostly OK, but people can change this version string to arbitrary thing while compiling, which can break the assumption if they had SP in it. Notably, Apple ships modified Git with " (Apple Git-xx)" appended to its version number. Instead, come up with the version string by stripping the "git version " from the beginning. Regressed-in: 480871e09ed2e5275b4ba16b278681e5a8c122ae Signed-off-by: Jeremy Huddleston Sequoia Reviewed-by: Josh Triplett --- t/t4014-format-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 909c743c13..414c56fcff 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -757,7 +757,7 @@ test_expect_success 'format-patch --ignore-if-in-upstream HEAD' ' git format-patch --ignore-if-in-upstream HEAD ' -git_version="$(git --version | sed "s/.* //")" +git_version="$(git --version | sed "s/git version //")" signature() { printf "%s\n%s\n\n" "-- " "${1:-$git_version}" From patchwork Tue Jan 29 19:38:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787195 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A24B51399 for ; Tue, 29 Jan 2019 20:04:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 925542D282 for ; Tue, 29 Jan 2019 20:04:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 869082D381; Tue, 29 Jan 2019 20:04:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FAA42D282 for ; Tue, 29 Jan 2019 20:04:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727332AbfA2UEg (ORCPT ); Tue, 29 Jan 2019 15:04:36 -0500 Received: from nwk-aaemail-lapp02.apple.com ([17.151.62.67]:49766 "EHLO nwk-aaemail-lapp02.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726984AbfA2UEg (ORCPT ); Tue, 29 Jan 2019 15:04:36 -0500 X-Greylist: delayed 1499 seconds by postgrey-1.27 at vger.kernel.org; Tue, 29 Jan 2019 15:04:35 EST Received: from pps.filterd (nwk-aaemail-lapp02.apple.com [127.0.0.1]) by nwk-aaemail-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb83f031166; Tue, 29 Jan 2019 11:39:39 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=Oc8P2hDEklH9h2Z9tF5vWOkJfZvfJ1ssM+fznDlxEb4=; b=viQrxpg9RcIPQ98OBw4FvnrpEpEV1DPmt3gVdZGWIyXGuZHMg7pDBK+KoY6iQXVyfe3J QvfO87Q9JRyzi1g+3yI3ZHjGUJ87W2FskbkkAx7Z/wTuUpmMHudw7OH93kSMwwYsJXUu gvBCNuWjEZgDL4n/1EPd4x1I59zD5W5BXFZBMZKR3u5r+LINfy8N/GkqH1OMbToMZnpF ktdTSFB8QXzE7XBbeGQ5yVroQ/lfztSKzqT3tbAi832uq2zdYFv7ogc7YTgICxhXkRS4 Wr6D8yKpxZsKiYblxW+TNjNYwRM29mRp2jIQHHpM3MHgGtw6ujxLWV5WmYD9HdZRMq+2 ug== Received: from mr2-mtap-s03.rno.apple.com (mr2-mtap-s03.rno.apple.com [17.179.226.135]) by nwk-aaemail-lapp02.apple.com with ESMTP id 2q8n0rt9d8-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:39 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by mr2-mtap-s03.rno.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300AIKYLYUZD0@mr2-mtap-s03.rno.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9PJK00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: f9accb4494658d1cb3de836023ba1b6e X-Va-R-CD: 0f8c382d5f1eb3c1f44878ee6d2bd78a X-Va-CD: 0 X-Va-ID: f4cdec7d-5914-4d28-a2dd-85c5c6293ea9 X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: f9accb4494658d1cb3de836023ba1b6e X-V-R-CD: 0f8c382d5f1eb3c1f44878ee6d2bd78a X-V-CD: 0 X-V-ID: 3771d776-88ee-4fdd-b176-3c67e2d15d80 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300100YK85D00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 05/13] t5701: git --version can have SP in it Date: Tue, 29 Jan 2019 11:38:11 -0800 Message-id: <20190129193818.8645-6-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jeremy Huddleston Sequoia --- t/t5701-git-serve.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh index ae79c6bbc0..7bc25700fa 100755 --- a/t/t5701-git-serve.sh +++ b/t/t5701-git-serve.sh @@ -7,7 +7,7 @@ test_description='test git-serve and server commands' test_expect_success 'test capability advertisement' ' cat >expect <<-EOF && version 2 - agent=git/$(git version | cut -d" " -f3) + agent=git/$(git --version | sed -e "s/git version //" -e "s/ /\./g") ls-refs fetch=shallow server-option From patchwork Tue Jan 29 19:38:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787199 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5D8031399 for ; Tue, 29 Jan 2019 20:06:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49D2B2D396 for ; Tue, 29 Jan 2019 20:06:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AC062D3AB; Tue, 29 Jan 2019 20:06:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5BE92D396 for ; Tue, 29 Jan 2019 20:06:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728192AbfA2UGl (ORCPT ); Tue, 29 Jan 2019 15:06:41 -0500 Received: from nwk-aaemail-lapp02.apple.com ([17.151.62.67]:55964 "EHLO nwk-aaemail-lapp02.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726984AbfA2UGl (ORCPT ); Tue, 29 Jan 2019 15:06:41 -0500 Received: from pps.filterd (nwk-aaemail-lapp02.apple.com [127.0.0.1]) by nwk-aaemail-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb83g031166; Tue, 29 Jan 2019 11:39:39 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=G8Yi1kQS/0EQt9KJ0/ja98BdIlutkZgK+emU4OZavv8=; b=CQUoD4BS5TE3M/O56ZLZ/qFBkBWs00DQCJ2XGoBRJ4fF7jOZydFXFkOEDAD+egliKyGF zwTJ51EyZ71EqlSenPCm9mslv8nhOCsw/h+6K40twZQ0mZw4ch/Zgx030lpBljwCjz7C s7hAqz7KnNaJHz3QxsqjFhJJSKA509sNk/JXlyXj5Gqx62m/MtdkBvHDlkVf3xNwSkWa KrMASWizTE4vHZHGb2jALw4DLHCkFlIQWy8L7bwWrN4i9pcdU0q7Aa9g87qk+yCGN06A Rbi5TpV1HSigdWVg03IIwgkgLxprJtbDxGLRrLiQkYpn0ueiyse1XpXhxaRIq+Uvx/xj ug== Received: from mr2-mtap-s03.rno.apple.com (mr2-mtap-s03.rno.apple.com [17.179.226.135]) by nwk-aaemail-lapp02.apple.com with ESMTP id 2q8n0rt9d8-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:39 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by mr2-mtap-s03.rno.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300AIKYLYUZD0@mr2-mtap-s03.rno.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300C00Y9IP800@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: efe0cb3df84d3e2b6fe8dd92a814c8b8 X-Va-R-CD: 701f5f596f5bfe2ff3f2fa67cee5a5ea X-Va-CD: 0 X-Va-ID: 9a95f7aa-0439-47be-951f-46da45f3b5ca X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: efe0cb3df84d3e2b6fe8dd92a814c8b8 X-V-R-CD: 701f5f596f5bfe2ff3f2fa67cee5a5ea X-V-CD: 0 X-V-ID: c6b8dfb5-9a32-4400-804d-ac385d45ec27 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300100YK85D00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 06/13] Set Apple Git version during build Date: Tue, 29 Jan 2019 11:38:12 -0800 Message-id: <20190129193818.8645-7-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jeremy Huddleston Sequoia --- GIT-VERSION-GEN | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index d1a2814ec7..6fb90854b9 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -3,6 +3,10 @@ GVF=GIT-VERSION-FILE DEF_VER=v2.20.1 +if [ -n "$RC_ProjectSourceVersion" ] ; then + DEF_VER="$DEF_VER (Apple Git-$RC_ProjectSourceVersion)" +fi + LF=' ' From patchwork Tue Jan 29 19:38:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787223 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6D5381390 for ; Tue, 29 Jan 2019 20:37:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5DCAA2D516 for ; Tue, 29 Jan 2019 20:37:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5201A2D694; Tue, 29 Jan 2019 20:37:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 082E12D516 for ; Tue, 29 Jan 2019 20:37:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729497AbfA2Uhp (ORCPT ); Tue, 29 Jan 2019 15:37:45 -0500 Received: from nwk-aaemail-lapp02.apple.com ([17.151.62.67]:53578 "EHLO nwk-aaemail-lapp02.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727075AbfA2Uhp (ORCPT ); Tue, 29 Jan 2019 15:37:45 -0500 Received: from pps.filterd (nwk-aaemail-lapp02.apple.com [127.0.0.1]) by nwk-aaemail-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb83h031166; Tue, 29 Jan 2019 11:39:39 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=76sBK2d5nQwrL8X9Ccghhd8b2CwGGIrgBF0cw/ur6z0=; b=PEVm9ZsjBKxOkz38dLruEjGMUhtcMfFt7Gzx30Qzi3USPCZ4mdc328fD46ec2pCb+N2Y i/1on4nShFsGN6cT3k5Z/ZWGacUocb0MqjAGKI0Zy4sYdPky96BE7F2FWpyykosUKKK2 vco8uFiNHleCH4Mjg5QmbkxE81E16ScrhqThU7266JC7IvZOh0TtVdr1zFmBxKmIGWq4 F2TWybXE3mgOQk8y5q1PSehnUwHC2Ldzw1omek4kVbff8IEjRHSbxfn8lB76OdrANGX0 CVPW/3jDDGU++/4U6ppGySoX6FzzN8O/ZyfJwp6x/AMi0IxXBsOPJQsVb0a301sRCD4n qg== Received: from mr2-mtap-s03.rno.apple.com (mr2-mtap-s03.rno.apple.com [17.179.226.135]) by nwk-aaemail-lapp02.apple.com with ESMTP id 2q8n0rt9d8-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:39 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by mr2-mtap-s03.rno.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300AIKYLYUZD0@mr2-mtap-s03.rno.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9OJL00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: 4385a352db838a1666258bb2a9b0434d X-Va-R-CD: ab960f9f96e5e8ef6750ffad1d7d3984 X-Va-CD: 0 X-Va-ID: b8aa9927-f456-4ed2-a40e-b833c7240c4e X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: 4385a352db838a1666258bb2a9b0434d X-V-R-CD: ab960f9f96e5e8ef6750ffad1d7d3984 X-V-CD: 0 X-V-ID: 294e4061-9ec2-4e0f-a971-3d73fd25278e Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300100YK85D00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 07/13] HTML documentation is not provided with Apple's git. Make the error message more on point. Date: Tue, 29 Jan 2019 11:38:13 -0800 Message-id: <20190129193818.8645-8-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jeremy Huddleston Sequoia --- builtin/help.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/help.c b/builtin/help.c index 7739a5c155..e001b6157c 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -383,7 +383,7 @@ static void get_html_page_path(struct strbuf *page_path, const char *page) if (!strstr(html_path, "://")) { if (stat(mkpath("%s/git.html", html_path), &st) || !S_ISREG(st.st_mode)) - die("'%s': not a documentation directory.", html_path); + die("HTML documentation is not provided by this distribution of git."); } strbuf_init(page_path, 0); From patchwork Tue Jan 29 19:38:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787197 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BCC04139A for ; Tue, 29 Jan 2019 20:04:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD6362D282 for ; Tue, 29 Jan 2019 20:04:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1B812D381; Tue, 29 Jan 2019 20:04:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FFD52D282 for ; Tue, 29 Jan 2019 20:04:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727473AbfA2UEm (ORCPT ); Tue, 29 Jan 2019 15:04:42 -0500 Received: from nwk-aaemail-lapp02.apple.com ([17.151.62.67]:49766 "EHLO nwk-aaemail-lapp02.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726984AbfA2UEm (ORCPT ); Tue, 29 Jan 2019 15:04:42 -0500 X-Greylist: delayed 1499 seconds by postgrey-1.27 at vger.kernel.org; Tue, 29 Jan 2019 15:04:35 EST Received: from pps.filterd (nwk-aaemail-lapp02.apple.com [127.0.0.1]) by nwk-aaemail-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb83i031166; Tue, 29 Jan 2019 11:39:39 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=TWflV/Qa8QKmHSflVyA0aJmsE1Mvnz+xqFAT+EJZCRc=; b=AZ4IeUMDcBv/h3EDZAzCMx5Kq2adp4sWw1SraiMaZKbfBN3omRkXGvigTP5xZNeggEPy kbfP1Fv3szz4fG94cjlaSDyAjKZ1OpfqDomzp+gG8jrqF9wCCdTGJm/ZNU1KJPDhq4rZ FYGoPcl3PCRNCJKQUiH4YlIOtm/LRpjRn0IIl2SJYs0cQvSKZ55rcF61IXCP+/U5Ob1+ zQhqg5b20j0dmU47pbf5MI3yNMdMJdy2gMoqGl86AuOqD4ZroctketXOYX6QrKrPNNiU VyUA8FyeFtNBXznf1ttt3bDU7nWzyDMgEtDSTk81WW5W0U0WtvXeh7lO8b7D2S0Nl/nb Nw== Received: from mr2-mtap-s03.rno.apple.com (mr2-mtap-s03.rno.apple.com [17.179.226.135]) by nwk-aaemail-lapp02.apple.com with ESMTP id 2q8n0rt9d8-9 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:39 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by mr2-mtap-s03.rno.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300AIKYLYUZD0@mr2-mtap-s03.rno.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9OJL00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: 15397c394c71dc32ddfd580d3694a409 X-Va-R-CD: 38569fc3dd080465860bd9d268b33f29 X-Va-CD: 0 X-Va-ID: d0364088-3cdb-4019-9313-e7828ca7cc0b X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: 15397c394c71dc32ddfd580d3694a409 X-V-R-CD: 38569fc3dd080465860bd9d268b33f29 X-V-CD: 0 X-V-ID: 5f87fe2d-aa1b-4254-8e1d-4a9355a8536d Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300000YJS3N00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 08/13] git mergetool/difftool doesn't list 'opendiff' as an available tool on 10.8 Date: Tue, 29 Jan 2019 11:38:14 -0800 Message-id: <20190129193818.8645-9-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP See Signed-off-by: Jeremy Huddleston Sequoia --- git-mergetool--lib.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 83bf52494c..f85be7406f 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -273,9 +273,9 @@ list_merge_tool_candidates () { then if test -n "$GNOME_DESKTOP_SESSION_ID" then - tools="meld opendiff kdiff3 tkdiff xxdiff $tools" + tools="meld kdiff3 tkdiff xxdiff $tools" else - tools="opendiff kdiff3 tkdiff xxdiff meld $tools" + tools="kdiff3 tkdiff xxdiff meld $tools" fi tools="$tools gvimdiff diffuse diffmerge ecmerge" tools="$tools p4merge araxis bc codecompare" @@ -288,6 +288,8 @@ list_merge_tool_candidates () { tools="$tools emerge vimdiff" ;; esac + + tools="opendiff $tools" } show_tool_help () { From patchwork Tue Jan 29 19:38:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787203 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 07D6D1399 for ; Tue, 29 Jan 2019 20:08:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EBA462D3AB for ; Tue, 29 Jan 2019 20:08:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDD832DA1A; Tue, 29 Jan 2019 20:08:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F1F72D3AB for ; Tue, 29 Jan 2019 20:08:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727388AbfA2UIP (ORCPT ); Tue, 29 Jan 2019 15:08:15 -0500 Received: from nwk-aaemail-lapp02.apple.com ([17.151.62.67]:60998 "EHLO nwk-aaemail-lapp02.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727229AbfA2UIP (ORCPT ); Tue, 29 Jan 2019 15:08:15 -0500 Received: from pps.filterd (nwk-aaemail-lapp02.apple.com [127.0.0.1]) by nwk-aaemail-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJb83l031166; Tue, 29 Jan 2019 11:39:40 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=L/IVwUZccTOnYqUCw67oQLwxddM8pdqcANP0OVfCW6M=; b=Y/bYLetZgoDM0wGTwiSh3KqK+Vp//pUjejMA+BbuHvaJDE34RRzLHTlpqhtmA1TNtmTx x+26onU8i0PzDHRzAioapBtXShZdGykq4ywSv15FLNmW6gBOWruAH7dT8me13DAgZBhr bou04YoaQFPtvwHK8nhGsoOHUzAyS2OQb9HrF7pVS5DozYZElkk0F2xa3NOx3GIJkbsc d5PhdVeIRXLBTVp8SHsuM+l4QmTAVriQTo/897Yg8VlFm6CqUobOtd/pAfz6DUV/ThUJ q51b686POmZr7gp8mRORARE1HwLz5iIQxzaX6ZB10xYzq+77HtJ2beWXGyd44OWYX3cz LQ== Received: from mr2-mtap-s03.rno.apple.com (mr2-mtap-s03.rno.apple.com [17.179.226.135]) by nwk-aaemail-lapp02.apple.com with ESMTP id 2q8n0rt9d8-11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:40 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by mr2-mtap-s03.rno.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300AIKYLYUZD0@mr2-mtap-s03.rno.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9PJA00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: 7313b4f6adbdb5a059c8640fcff253e3 X-Va-R-CD: d193468aa2b6071e286eda62f2399c92 X-Va-CD: 0 X-Va-ID: bfc5a4ff-45b6-422f-b0e7-d31ba5efdae3 X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: 7313b4f6adbdb5a059c8640fcff253e3 X-V-R-CD: d193468aa2b6071e286eda62f2399c92 X-V-CD: 0 X-V-ID: dbbe7101-3200-4989-9b68-4b5dd0b89b41 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300100YK85D00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 09/13] Use symbolic links rather than hard links for files in libexec Date: Tue, 29 Jan 2019 11:38:15 -0800 Message-id: <20190129193818.8645-10-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP See Signed-off-by: Jeremy Huddleston Sequoia --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1a44c811aa..60711d6abe 100644 --- a/Makefile +++ b/Makefile @@ -2065,10 +2065,7 @@ version.sp version.s version.o: EXTRA_CPPFLAGS = \ git rev-parse -q --verify HEAD 2>/dev/null)"' $(BUILT_INS): git$X - $(QUIET_BUILT_IN)$(RM) $@ && \ - ln $< $@ 2>/dev/null || \ - ln -s $< $@ 2>/dev/null || \ - cp $< $@ + $(QUIET_BUILT_IN)ln -fs $< $@ command-list.h: generate-cmdlist.sh command-list.txt @@ -2387,7 +2384,6 @@ git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB) $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY) $(QUIET_LNCP)$(RM) $@ && \ - ln $< $@ 2>/dev/null || \ ln -s $< $@ 2>/dev/null || \ cp $< $@ From patchwork Tue Jan 29 19:38:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787221 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 82A8A184E for ; Tue, 29 Jan 2019 20:37:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 743562D516 for ; Tue, 29 Jan 2019 20:37:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 68B212D67E; Tue, 29 Jan 2019 20:37:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E6F02D4AB for ; Tue, 29 Jan 2019 20:37:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729494AbfA2Uhj (ORCPT ); Tue, 29 Jan 2019 15:37:39 -0500 Received: from nwk-aaemail-lapp02.apple.com ([17.151.62.67]:53290 "EHLO nwk-aaemail-lapp02.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727075AbfA2Uhj (ORCPT ); Tue, 29 Jan 2019 15:37:39 -0500 Received: from pps.filterd (nwk-aaemail-lapp02.apple.com [127.0.0.1]) by nwk-aaemail-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJbBev031277; Tue, 29 Jan 2019 11:39:37 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=t18LFcmB4nZOIZxmmaXGdw/drMMtvWyYEmqKTCKdmmA=; b=ch0dM/sj55y34aLwYBE8vUU47l2VRWBmgicKtBmCpNTTVlwgAXtNvvOevQPmsSTuVhJA Rn+hbr8S25nR0IM7NJcmXVWu0O4LpYtLn8emPh4wbqg9cHHda/JjPTaeaKBHkC20u8fd Noq5B7S4TQoaP9wuefUARcs3bSVs5Tn+hmkJrc0zzaytDw2L2BuKhKVai34/Ph5ccvUW v4G4WZ5nkF+rJpXnCnwU3dBfZR92KyiRx4Gg78mDdtq9XdPKfWN7sRKqQeLaC5cBF9jP v0TYJfUYTMqJQOu6/MCGs04VtgHn6EN5ohLevkStIkDWOFfPFw8LXYklLJpe3hR/cG06 sQ== Received: from ma1-mtap-s03.corp.apple.com (ma1-mtap-s03.corp.apple.com [17.40.76.7]) by nwk-aaemail-lapp02.apple.com with ESMTP id 2q8n0rt9dm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:37 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by ma1-mtap-s03.corp.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300DUDYM0TQE0@ma1-mtap-s03.corp.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9PJE00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: a324fb39882bde8fb617536cf1a8f873 X-Va-R-CD: d582dc3534525aab2000a3f1402a7161 X-Va-CD: 0 X-Va-ID: fcfbd055-2477-45fd-aa80-e7cfcc75af44 X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: a324fb39882bde8fb617536cf1a8f873 X-V-R-CD: d582dc3534525aab2000a3f1402a7161 X-V-CD: 0 X-V-ID: 3bf7a24d-abcd-47ab-a9ab-8ac44ecefa4e Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300100YK85D00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:35 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 10/13] Support for Xcode.app co-exestince and relocation Date: Tue, 29 Jan 2019 11:38:16 -0800 Message-id: <20190129193818.8645-11-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch has been trimmed down significantly from its original version when rebasing on top of git 2.18 because git 2.18 included support for runtime prefix support for darwin, making this patch mostly duplicative. The remaining changes are needed to ensure that git-perl can find the subversion perl module (which relocates with it) and handle relocation of python scripts. Signed-off-by: Jeremy Huddleston Sequoia --- Makefile | 3 +++ .../runtime_prefix.template.pl | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/Makefile b/Makefile index 60711d6abe..97f46444f5 100644 --- a/Makefile +++ b/Makefile @@ -2171,6 +2171,7 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile sed -e 's=@@PATHSEP@@=$(pathsep)=g' \ -e "s=@@INSTLIBDIR@@=$$INSTLIBDIR=g" \ -e 's=@@PERLLIBDIR_REL@@=$(perllibdir_relative_SQ)=g' \ + -e 's=@@PERLVERSION@@=$(shell grep DEFAULT /usr/local/versioner/perl/versions | sed 's:^.*= *\([^ ]*\)$$:\1:')=g' \ -e 's=@@GITEXECDIR_REL@@=$(gitexecdir_relative_SQ)=g' \ -e 's=@@LOCALEDIR_REL@@=$(localedir_relative_SQ)=g' \ $< >$@+ && \ @@ -2206,6 +2207,8 @@ $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS $(SCRIPT_PYTHON_GEN): % : %.py $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \ + -e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \ + -e 's|"@@INSTLIBDIR@@"|os.path.realpath(os.path.dirname(sys.argv[0])) + "/../../share/git-core/python"|g' \ $< >$@+ && \ chmod +x $@+ && \ mv $@+ $@ diff --git a/perl/header_templates/runtime_prefix.template.pl b/perl/header_templates/runtime_prefix.template.pl index 9d28b3d863..b0b6b0bef1 100644 --- a/perl/header_templates/runtime_prefix.template.pl +++ b/perl/header_templates/runtime_prefix.template.pl @@ -1,3 +1,28 @@ +# BEGIN XCODE RUNTIME_PREFIX generated code +BEGIN { + use File::Spec; + my $PERLVERSION = "@@PERLVERSION@@"; + if ($^V =~ m/v([0-9]+).([0-9]+)/) { + $PERLVERSION = $1.".".$2; + } + my $__prefix = File::Spec->rel2abs( __FILE__ ); + + if ($__prefix =~ m/\/libexec\/git-core\// ) { + $__prefix =~ s/\/libexec\/git-core\/.*//; + unshift @INC, $__prefix . "/share/git-core/perl"; + unshift @INC, $__prefix . "/../Library/Perl/".$PERLVERSION."/darwin-thread-multi-2level"; + } elsif ($__prefix =~ m/\/bin\// ) { + $__prefix =~ s/\/bin\/.*//; + unshift @INC, $__prefix . "/share/git-core/perl"; + unshift @INC, $__prefix . "/../Library/Perl/".$PERLVERSION."/darwin-thread-multi-2level"; + } elsif ( $__prefix =~ m/\/usr\// ) { + $__prefix =~ s/\/usr\/.*/\/usr/; + unshift @INC, $__prefix . "/share/git-core/perl"; + unshift @INC, $__prefix . "/../Library/Perl/".$PERLVERSION."/darwin-thread-multi-2level"; + } +} +# END XCODE RUNTIME_PREFIX generated code. + # BEGIN RUNTIME_PREFIX generated code. # # This finds our Git::* libraries relative to the script's runtime path. From patchwork Tue Jan 29 19:38:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A1F6B13B4 for ; Tue, 29 Jan 2019 22:50:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90C8F2D151 for ; Tue, 29 Jan 2019 22:50:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8523B2D184; Tue, 29 Jan 2019 22:50:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A8452D12A for ; Tue, 29 Jan 2019 22:50:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729498AbfA2Wub (ORCPT ); Tue, 29 Jan 2019 17:50:31 -0500 Received: from nwk-aaemail-lapp02.apple.com ([17.151.62.67]:47044 "EHLO nwk-aaemail-lapp02.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727358AbfA2Wub (ORCPT ); Tue, 29 Jan 2019 17:50:31 -0500 Received: from pps.filterd (nwk-aaemail-lapp02.apple.com [127.0.0.1]) by nwk-aaemail-lapp02.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJbBew031277; Tue, 29 Jan 2019 11:39:37 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=tXqg4DvTpKqYzsMuSdOEUNy5EFXkrQjCwc74WAnmBEI=; b=u+tBAm+OKccTyl5fBsVSova4qYMFWKrFqxBoSC/dSvJ/cdPgWERZcuznzjK//zgx5kyQ ZHREXKIK2voDAzMkwf34DgJMVfq7Yj54DMpIdJR4pWWiEgaIxde3mlJWsVWvP3+h8qJ1 1pTLRtd9BW9gFh8yb/8l6v4x5apV5JkejMwyFIL47MyYG0EcZ9KNo9+hhhe/Qh1uCL8/ +3UECTAfP8SPNev7Nbm0SCZK3DY767NuuCUaZIfC2MMTHZbZ3sN8Dczzh2I9nvLBA2Xe gtkyuO3ez2uo+46SeuSxKzOtMHxd78wptR0XeM7RVzUb2eGuM9Sjh+lApPh/RV6AlI6D Qw== Received: from ma1-mtap-s03.corp.apple.com (ma1-mtap-s03.corp.apple.com [17.40.76.7]) by nwk-aaemail-lapp02.apple.com with ESMTP id 2q8n0rt9dm-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:37 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by ma1-mtap-s03.corp.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300DUDYM0TQE0@ma1-mtap-s03.corp.apple.com>; Tue, 29 Jan 2019 11:39:37 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9OJB00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: ffe9239ee5336c79bdae8b021a3b2470 X-Va-R-CD: e1e9935b7f56b73d09788c6c2f952525 X-Va-CD: 0 X-Va-ID: fe55461a-ac14-44c8-8cf7-c059218a33c1 X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: ffe9239ee5336c79bdae8b021a3b2470 X-V-R-CD: e1e9935b7f56b73d09788c6c2f952525 X-V-CD: 0 X-V-ID: 695bfd83-34de-401d-a7fc-0eaf592893a2 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300000YJS3N00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Matt Wright Subject: [PATCH (Apple Git) 11/13] Fix problem found from running the test suite. Date: Tue, 29 Jan 2019 11:38:17 -0800 Message-id: <20190129193818.8645-12-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Matt Wright Signed-off-by: Matt Wright --- git-svn.perl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/git-svn.perl b/git-svn.perl index 050f2a36f4..d29730be3b 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -1815,6 +1815,36 @@ sub complete_url_ls_init { sub verify_ref { my ($ref) = @_; + + if ($ref =~ /^(.*)\^0$/) { + my $baseref = $1; + my $p = "$ENV{GIT_DIR}/$baseref"; + $p = "$ENV{GIT_DIR}/refs/remotes/$baseref" unless -e $p; + $p = "$ENV{GIT_DIR}/refs/$baseref" unless -e $p; + $p = "$ENV{GIT_DIR}/refs/heads/$baseref" unless -e $p; + + my $resolved = undef; + if (-e $p) { + open FH, $p; + $resolved = ; + chomp $resolved; + close FH; + } elsif (-e "$ENV{GIT_DIR}/packed-refs") { + open FH, "$ENV{GIT_DIR}/packed-refs"; + while () { + if ($_ =~ /^([0-9a-fA-F]+) ((refs\/)?(remotes\/|heads\/|\/)?$baseref)$/) { + $resolved = $1; + last; + } + } + } + + if (defined($resolved)) { + return verify_ref("$1^0") if $resolved =~ /^ref: (.*)$/; + return $resolved + } + } + eval { command_oneline([ 'rev-parse', '--verify', $ref ], { STDERR => 0 }); }; } From patchwork Tue Jan 29 19:38:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787257 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4241D1399 for ; Tue, 29 Jan 2019 21:31:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 338652D6BC for ; Tue, 29 Jan 2019 21:31:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27EC02D51B; Tue, 29 Jan 2019 21:31:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1683C2D6BC for ; Tue, 29 Jan 2019 21:31:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729634AbfA2Vbl (ORCPT ); Tue, 29 Jan 2019 16:31:41 -0500 Received: from ma1-aaemail-dr-lapp03.apple.com ([17.171.2.72]:37326 "EHLO ma1-aaemail-dr-lapp03.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727488AbfA2Vbl (ORCPT ); Tue, 29 Jan 2019 16:31:41 -0500 X-Greylist: delayed 6722 seconds by postgrey-1.27 at vger.kernel.org; Tue, 29 Jan 2019 16:31:40 EST Received: from pps.filterd (ma1-aaemail-dr-lapp03.apple.com [127.0.0.1]) by ma1-aaemail-dr-lapp03.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJasc2029331; Tue, 29 Jan 2019 11:39:37 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=oZCsS/F6M56rBE3XIcTB+LABoJ8tHK6cuDWLKKxe/L4=; b=UTLtRqCkzKr9SX9vAUdt/QOhheAmmF2rU7ZPNVPkSHdLIaW/ZimJ1KP4jOkl/hjuvsBi +Vha2SD2R/Bh10sSHs5GYMapeZwSCE23LaVHZd2cXrcOakw4ecNK4BphQkhJADczhSPf N4m2m3oqc3TYsJY5RYvTzuWM/E+/e772ok8wfsaJiwKtP0A0c1AqU/rVMya5655Pv+d9 98llzxAIYEkTtkz4pq4rEr8V/kdyjTkzUVWHBv9oyP9ZSaPTKAW62r49lUc8px+EcOYu w7rrB3Qnkz16xUTztzq3Vl+q9SmxNlNVhgC2bAJDuy1uFeK2yG0TsjsL7CcVwUx4Aep9 qg== Received: from mr2-mtap-s01.rno.apple.com (mr2-mtap-s01.rno.apple.com [17.179.226.133]) by ma1-aaemail-dr-lapp03.apple.com with ESMTP id 2q8qe37s2f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:37 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by mr2-mtap-s01.rno.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300L5TYM0BND0@mr2-mtap-s01.rno.apple.com>; Tue, 29 Jan 2019 11:39:37 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300D00Y9OJD00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: 20253dfa3f84e566887060199d60e0a4 X-Va-R-CD: 5941725aa36e7881aa01cb4c3b14f216 X-Va-CD: 0 X-Va-ID: cdd3993b-ba54-4e63-832f-7f7b36d2e44c X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: 20253dfa3f84e566887060199d60e0a4 X-V-R-CD: 5941725aa36e7881aa01cb4c3b14f216 X-V-CD: 0 X-V-ID: abc977ae-4d02-452f-8d5c-77cf71cea422 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300000YJS3N00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig Date: Tue, 29 Jan 2019 11:38:18 -0800 Message-id: <20190129193818.8645-13-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Useful for setting up osxkeychain in Xcode.app's gitconfig Signed-off-by: Jeremy Huddleston Sequoia --- config.c | 13 +++++++++++++ config.h | 2 ++ 2 files changed, 15 insertions(+) diff --git a/config.c b/config.c index ff521eb27a..656bfef8ab 100644 --- a/config.c +++ b/config.c @@ -1631,6 +1631,14 @@ const char *git_etc_gitconfig(void) return system_wide; } +const char *git_xcode_gitconfig(void) +{ + static const char *xcode_config; + if (!xcode_config) + xcode_config = system_path("share/git-core/gitconfig"); + return xcode_config; +} + /* * Parse environment variable 'k' as a boolean (in various * possible spellings); if missing, use the default value 'def'. @@ -1673,6 +1681,11 @@ static int do_git_config_sequence(const struct config_options *opts, else repo_config = NULL; + current_parsing_scope = CONFIG_SCOPE_XCODE; + if (git_config_system() && git_xcode_gitconfig() && !access_or_die(git_xcode_gitconfig(), R_OK, 0)) + ret += git_config_from_file(fn, git_xcode_gitconfig(), + data); + current_parsing_scope = CONFIG_SCOPE_SYSTEM; if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK, 0)) ret += git_config_from_file(fn, git_etc_gitconfig(), diff --git a/config.h b/config.h index ee5d3fa7b4..f848423d28 100644 --- a/config.h +++ b/config.h @@ -115,6 +115,7 @@ extern int git_config_rename_section_in_file(const char *, const char *, const c extern int git_config_copy_section(const char *, const char *); extern int git_config_copy_section_in_file(const char *, const char *, const char *); extern const char *git_etc_gitconfig(void); +extern const char *git_xcode_gitconfig(void); extern int git_env_bool(const char *, int); extern unsigned long git_env_ulong(const char *, unsigned long); extern int git_config_system(void); @@ -131,6 +132,7 @@ enum config_scope { CONFIG_SCOPE_GLOBAL, CONFIG_SCOPE_REPO, CONFIG_SCOPE_CMDLINE, + CONFIG_SCOPE_XCODE, }; extern enum config_scope current_config_scope(void); From patchwork Tue Jan 29 19:38:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sequoia X-Patchwork-Id: 10787259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40359922 for ; Tue, 29 Jan 2019 21:32:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 305962D3B6 for ; Tue, 29 Jan 2019 21:32:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 243482D4C2; Tue, 29 Jan 2019 21:32:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CC2A02D3B6 for ; Tue, 29 Jan 2019 21:32:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729609AbfA2Vcf (ORCPT ); Tue, 29 Jan 2019 16:32:35 -0500 Received: from ma1-aaemail-dr-lapp03.apple.com ([17.171.2.72]:39706 "EHLO ma1-aaemail-dr-lapp03.apple.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729531AbfA2Vcf (ORCPT ); Tue, 29 Jan 2019 16:32:35 -0500 Received: from pps.filterd (ma1-aaemail-dr-lapp03.apple.com [127.0.0.1]) by ma1-aaemail-dr-lapp03.apple.com (8.16.0.27/8.16.0.27) with SMTP id x0TJasc3029331; Tue, 29 Jan 2019 11:39:38 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apple.com; h=mime-version : content-transfer-encoding : content-type : from : to : cc : subject : date : message-id : in-reply-to : references; s=20180706; bh=PcSEQlv2ej7UIOl3joc+2+vIcGSc8qA2iFGc2CB2Fxo=; b=ovbZGYN4A1RKmXIeUvjXvJALt7IdU5eh9W5F+0FULrhCj2chzDfPjFzWv1VhVKImamER GEkBJ35XeaFW7gJFer/YBT4/7sFzzq82lGi6OHiJFxZ4RNesSbR7VpOlQ+PbAjRE+JDy rwNzXsFCrizeaAI1/dOnbctilYcWZH4mY9nO3ZHOJ5gE5eAfBB/S7RQjbeKNpnNjakWP H6kbvyu0DSTJDcKRgUDZOR6L6+DAqY/yHFWn/hoLK/kze8phQB8gXjfkH4/cBvkjw/yU jh2iNPvnBHo0RXVgEm0xWHkeuvA9x+Wj0UhaRA46Q0z/TxrJOPk16ekzm+9CTX8FutNT LA== Received: from mr2-mtap-s01.rno.apple.com (mr2-mtap-s01.rno.apple.com [17.179.226.133]) by ma1-aaemail-dr-lapp03.apple.com with ESMTP id 2q8qe37s2f-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Tue, 29 Jan 2019 11:39:37 -0800 MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: TEXT/PLAIN Received: from nwk-relayp-sz03.apple.com (nwk-relayp-sz03.apple.com [17.128.113.11]) by mr2-mtap-s01.rno.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTPS id <0PM300L5TYM0BND0@mr2-mtap-s01.rno.apple.com>; Tue, 29 Jan 2019 11:39:37 -0800 (PST) Received: from process_viserion-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300C00Y9IP900@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:37 -0800 (PST) X-Va-A: X-Va-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-Va-E-CD: 249c6f1ae3114c2f13bfeafb12b7216f X-Va-R-CD: 6c9f092297d979b2478c63065f77f984 X-Va-CD: 0 X-Va-ID: f70a43ec-340b-4a19-83dd-dcb39c14d06e X-V-A: X-V-T-CD: ff40b79dc1582ca1bb0a38bbb8b21c87 X-V-E-CD: 249c6f1ae3114c2f13bfeafb12b7216f X-V-R-CD: 6c9f092297d979b2478c63065f77f984 X-V-CD: 0 X-V-ID: e6cf812c-3b6d-414a-bef4-dca1d0f21847 Received: from process_milters-daemon.nwk-relayp-sz03.apple.com by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) id <0PM300000YJS3N00@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) Authentication-results: corp.apple.com; spf=softfail smtp.mailfrom=jeremyhu@apple.com; dmarc=quarantine header.from=apple.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Received: from tifa.apple.com (unknown [17.114.130.22]) by nwk-relayp-sz03.apple.com (Oracle Communications Messaging Server 8.0.2.3.20181024 64bit (built Oct 24 2018)) with ESMTP id <0PM30080GYLYQX50@nwk-relayp-sz03.apple.com>; Tue, 29 Jan 2019 11:39:36 -0800 (PST) From: Jeremy Huddleston Sequoia To: git@vger.kernel.org Cc: peff@peff.net, Jeremy Huddleston Sequoia Subject: [PATCH (Apple Git) 13/13] Enable support for Xcode.app-bundled gitattributes Date: Tue, 29 Jan 2019 11:38:19 -0800 Message-id: <20190129193818.8645-14-jeremyhu@apple.com> X-Mailer: git-send-email 2.20.0 (Apple Git-115) In-reply-to: <20190129193818.8645-1-jeremyhu@apple.com> References: <20190129193818.8645-1-jeremyhu@apple.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-01-29_15:,, signatures=0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jeremy Huddleston Sequoia --- attr.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/attr.c b/attr.c index eaece6658d..1b87905d4a 100644 --- a/attr.c +++ b/attr.c @@ -823,6 +823,14 @@ static const char *git_etc_gitattributes(void) return system_wide; } +static const char *git_xcode_gitattributes(void) +{ + static const char *xcode_gitattributes; + if (!xcode_gitattributes) + xcode_gitattributes = system_path("share/git-core/gitattributes"); + return xcode_gitattributes; +} + static const char *get_home_gitattributes(void) { if (!git_attributes_file) @@ -864,6 +872,9 @@ static void bootstrap_attr_stack(const struct index_state *istate, /* system-wide frame */ if (git_attr_system()) { + e = read_attr_from_file(git_xcode_gitattributes(), 1); + push_stack(stack, e, NULL, 0); + e = read_attr_from_file(git_etc_gitattributes(), 1); push_stack(stack, e, NULL, 0); }