From patchwork Fri Apr 12 11:39:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood via GitGitGadget X-Patchwork-Id: 10898043 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 A82331800 for ; Fri, 12 Apr 2019 11:39:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88F9528818 for ; Fri, 12 Apr 2019 11:39:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D5EA28D13; Fri, 12 Apr 2019 11:39: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,FREEMAIL_FROM,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 216B728818 for ; Fri, 12 Apr 2019 11:39:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726912AbfDLLjq (ORCPT ); Fri, 12 Apr 2019 07:39:46 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:36195 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726709AbfDLLjp (ORCPT ); Fri, 12 Apr 2019 07:39:45 -0400 Received: by mail-ed1-f65.google.com with SMTP id u57so7412118edm.3 for ; Fri, 12 Apr 2019 04:39:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=q4W6RUTbEpyt8sOoPj2gEL1SKt0Obj6uSXUTnkdR+Go=; b=JRTbzdj6VMHlod1T93jZaqq9QqBq+aMkCRFGRNuHJFo5H7vHlFbRAc9WDzZNyEr6ex eQj2lTDh3D/QHYiff9Xve/HMqImRA9xU7tPXrEC3cGk4c3kFsEeTQQdIYJIPim6UYWFq 1FBUvjFqBg/2uHspX+56kdwfTyPMCFE9eEK2L0KuxIIV+2gTHpI/I0uYTPGXCrPgoEAt qSRZkpDe2v0MugQEzlCfkS7MHIqmBL/IwvS0WIBGwxE/xX4JSCztke60FCQx8ijh9588 ypw6RONtNyw3rhrOmZir9+fWrVq+MyjALXFl5y+CkZedce/ZLHiagPAhV66rKm2/3HBy lhVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=q4W6RUTbEpyt8sOoPj2gEL1SKt0Obj6uSXUTnkdR+Go=; b=SAKmuFxI2hmAXjd4I1JXCwx4VPyZQdVidXrimF4fG/efWmcmhNvRrbhitQmLNHOIqz 2gpxHMeDCw5GFAtuV3R0Yu6zFNfFHEYRedKwZUKGvAyWEwSqRtywT7dP4nJPcdJeoujo dp3EGMqpupvmnfWPl0WYW213AMpO4uK37zO0e8rFQvoBb7F8fxM4Yuq9jfZXtOjFYaNp s4hB0p8YTyt+2OpFtlySjWfrkFGnUvTZZbqIIFqFGI4eRmX9sQr7ZP5MOXPMwayDT7wQ Uziw6+L8WGy12ZNOHrlfVt1Y70XD/rbaKq8QDtx2oEXH1heSaDUTS8ljSZ9qCFiFRJcx 9mKg== X-Gm-Message-State: APjAAAWs2Eqldq3a0R5NZuz4alPVvKYdvmViot0VWan2wpmtyh4Sokcx bbK3pJ36kQp6qpnWJAFJRtUibluw X-Google-Smtp-Source: APXvYqwkv6c0mqQsfuZ2H16OvsQ8ql/cUR8jBwtTU6U7IQ+Abfo8t2uYYS66MO8xz1PbQa0dUjzXbg== X-Received: by 2002:aa7:c991:: with SMTP id c17mr13658008edt.227.1555069183823; Fri, 12 Apr 2019 04:39:43 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 63sm1747448edn.32.2019.04.12.04.39.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 04:39:43 -0700 (PDT) Date: Fri, 12 Apr 2019 04:39:43 -0700 (PDT) X-Google-Original-Date: Fri, 12 Apr 2019 11:39:40 GMT Message-Id: <52681aee0a9657691521baf13f792bcfb9eeb898.1555069181.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 1/2] t9822: skip tests if file names cannot be ISO-8895-1 encoded Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin Most notably, it seems that macOS' APFS does not allow that. Signed-off-by: Johannes Schindelin --- t/t9822-git-p4-path-encoding.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/t/t9822-git-p4-path-encoding.sh b/t/t9822-git-p4-path-encoding.sh index c78477c19b..de0b46581d 100755 --- a/t/t9822-git-p4-path-encoding.sh +++ b/t/t9822-git-p4-path-encoding.sh @@ -7,6 +7,13 @@ test_description='Clone repositories with non ASCII paths' UTF8_ESCAPED="a-\303\244_o-\303\266_u-\303\274.txt" ISO8859_ESCAPED="a-\344_o-\366_u-\374.txt" +ISO8859="$(printf "$ISO8859_ESCAPED")" && +echo content123 >"$ISO8859" && +rm "$ISO8859" || { + skip_all="fs does not accept ISO-8859-1 filenames" + test_done +} + test_expect_success 'start p4d' ' start_p4d ' From patchwork Fri Apr 12 11:39:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood via GitGitGadget X-Patchwork-Id: 10898045 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 607621874 for ; Fri, 12 Apr 2019 11:39:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41B2C28818 for ; Fri, 12 Apr 2019 11:39:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3626828AC2; Fri, 12 Apr 2019 11:39:48 +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,FREEMAIL_FROM,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 D9A0B28818 for ; Fri, 12 Apr 2019 11:39:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726962AbfDLLjq (ORCPT ); Fri, 12 Apr 2019 07:39:46 -0400 Received: from mail-ed1-f65.google.com ([209.85.208.65]:36196 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726702AbfDLLjq (ORCPT ); Fri, 12 Apr 2019 07:39:46 -0400 Received: by mail-ed1-f65.google.com with SMTP id u57so7412145edm.3 for ; Fri, 12 Apr 2019 04:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=bmLxfGOYFkRPzwOfAScQZAJO4Qb6uuc5fdvNBwHewN0=; b=r9TjTW7q1sLeka8dnljCaMmTKywPPXiZ2XLlb4a8HQ/qb9QEUeXhqwpN2WBL+nji9A z7g9g4kixuoqCqUD1qtJi13uRN7KTnIwmnFsq8COZoz6BuWxY9ml8uLJCHo2IaD8b2Kt 4YoWRVO9a5uLMKKbkne4i9I2uaPO6GTnihbhipGaiiBhq9J+C/yBZALc+xNSaWmF3qMr XIvwbEPy3dak8+VQlVxKIJLVAk4VCK/Sa16AARpeD7oIdO/s+O5UpSw79eJaxhLb+i8y knZm+TXVz7CRLCF/Z0PZPAMXTgJE9Rix/7QnzcifQtvbtTXCiEJScnQiB42Yc1xgOHgS Xf5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=bmLxfGOYFkRPzwOfAScQZAJO4Qb6uuc5fdvNBwHewN0=; b=S8dDcLgifg9wUNrsqa9mYnJuB/jjTlC4lbA5tjHZ7RlNizBGTXUH8AlOXeZfdepGrO QAaVKtcGDHIh6qRrXeRD9Vsiiyx31zWkEt7TkjWZNh98nwKewhpzRw7w/6uUloubTFjt Yp5qfDg9NHUASdR8KXmma7L1tTXBTfRTivSUimEfEBnjcjCHKjsCCTLHfa5YcTJ8iObt T2V1uj7FM1TmqkdW/2ekx1g6usmkaLuw5fLaIdZXFIQ7ECYf6V3vKIw4HD9UmHxLCr3L HqItKss8yqZA1rVuv0yxVlwL/8x79Fp5GoWrHDn+QuIJA3uoiztnfsx163qSrnG8cZm2 hDDA== X-Gm-Message-State: APjAAAVSwbv32Itc5WVCj+Nz9JMOTVSYSpkzSctq0FP6aXM55MEBnd25 SyGBNFrPrTFI0RmxVeL/aCP2Doiv X-Google-Smtp-Source: APXvYqyTbjooNPuG/ZaTFivKFqCySin6Jm5cTc7nurhQJjMmS6PiMk9eK7gsiUUQkSKwQ/t/eOuItQ== X-Received: by 2002:a17:906:4c4e:: with SMTP id d14mr22277550ejw.127.1555069184548; Fri, 12 Apr 2019 04:39:44 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s14sm1487129eda.26.2019.04.12.04.39.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 04:39:44 -0700 (PDT) Date: Fri, 12 Apr 2019 04:39:44 -0700 (PDT) X-Google-Original-Date: Fri, 12 Apr 2019 11:39:41 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 2/2] macOS: make sure that gettext is found Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin Due to reasons (some XCode versions seem to include gettext, some don't?), Homebrew does not expose the libraries and headers in /usr/local/ by default anymore. Let's help find them again. Note: for some reason, this is a change of behavior caused by the upgrade to Mojave, identified in our Azure Pipeline; it seems that Homebrew used to add the /usr/local/ directories to the include and link search path before, but now it no longer does. Signed-off-by: Johannes Schindelin --- config.mak.uname | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index 41e85fab1c..3605fead53 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -114,6 +114,8 @@ ifeq ($(uname_S),Darwin) HAVE_BSD_SYSCTL = YesPlease FREAD_READS_DIRECTORIES = UnfortunatelyYes HAVE_NS_GET_EXECUTABLE_PATH = YesPlease + BASIC_CFLAGS += -I/usr/local/include + BASIC_LDFLAGS += -L/usr/local/lib endif ifeq ($(uname_S),SunOS) NEEDS_SOCKET = YesPlease