From patchwork Mon Aug 17 09:07:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila_via_GitGitGadget?= X-Patchwork-Id: 11717441 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE1F4722 for ; Mon, 17 Aug 2020 09:09:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AFD14207DF for ; Mon, 17 Aug 2020 09:09:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HbtNJm2x" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728214AbgHQJJq (ORCPT ); Mon, 17 Aug 2020 05:09:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728790AbgHQJH5 (ORCPT ); Mon, 17 Aug 2020 05:07:57 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28B0EC061344 for ; Mon, 17 Aug 2020 02:07:57 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 9so12602586wmj.5 for ; Mon, 17 Aug 2020 02:07:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to; bh=9uN/MSfBMWyswWiU7ek/eyPg3UTXBZjvSsr47gFC2NQ=; b=HbtNJm2x1OYBVgnETZpfmXSU4LjF9jwk5MpVemTUrc738pHhY91ey52KgtUAZkSQtT MIj7zYDpCltlFoZJTQ6f1aD7p0Lb7nRt4GR6MK621lU0JbvuugALcxzKtifwp/VX2AfQ 8ieOKdVNny/NRmpCi7LxWrXozHoGzyXktpVu3e5W+Um3GWrTxWK3C6bFAGNAzZ6OWCDz aUO4Btiy10PeB7HmWfwzKiUnm7CAcPE3NBQzCopWTeL4Ppl+zjecuSbQkVX2T9hvfQX/ kxu3ES+V/NWqVzpzXn7I6wdBv+/EKpOoKx25QEtgomPK9bsyt1rrRVkhgGqhCbKiFN2s FGSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to; bh=9uN/MSfBMWyswWiU7ek/eyPg3UTXBZjvSsr47gFC2NQ=; b=lVvUR4pbIx5kP7KqArjukxcE7Mhet/hS1aGMhY+bwPPT235Kf8Bbbjf98MeZDYb8Al xZTazBpb9HvoulnfaDMH/mj6NMcjI2IX+Jsvjb7XB3ZqaSdx/cGkuDHxs8hhnr+Ol0rB f2cw8QWJ7hSRvF5wBcUKlD10FKDVj1MfKu66EaPx8MLiC7H1quU5B3EtUSYFdDIV+znM yJf+gAqId5dUrzdw8dLFnxOsCYtT3S/BvPRYGDjjhft3XkPke/g2rTNQtBQ7GeZqpxvv 6iV62Mzs07xuLnp99kcgU1+37mSExqb9+tZhv4bJBwwQj6qN0YRhUGmREDQDlNeAbEtV xwrQ== X-Gm-Message-State: AOAM531em8maI2FERUESN8v/Do+SfHUVfdtUHIETfdqxUP+Qrn/ulyfO UbWxTt/t8l8pJfatoQK/lU6P096dHwY= X-Google-Smtp-Source: ABdhPJzjv5OTp8Q1wtci6ptrZonAEx/ZzLXNw2I8DdB4dbu+0SJyMK9asxiZhPEm5Er4IwfWpPTsYg== X-Received: by 2002:a1c:f416:: with SMTP id z22mr13211297wma.62.1597655275518; Mon, 17 Aug 2020 02:07:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z8sm28062858wmf.42.2020.08.17.02.07.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 02:07:55 -0700 (PDT) From: Johannes Schindelin X-Google-Original-From: Johannes Schindelin Message-Id: <120d2bb3e461717e5248bb4c97feab86d4e45c9d.1597655273.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 17 Aug 2020 09:07:51 +0000 Subject: [PATCH 1/3] msvc: copy the correct `.pdb` files in the Makefile target `install` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There is a hard-coded list of `.pdb` files to copy. But we are about to introduce the `SKIP_DASHED_BUILT_INS` knob in the `Makefile`, which might make this hard-coded list incorrect. Let's switch to a dynamically-generated list instead. Signed-off-by: Johannes Schindelin --- Makefile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 372139f1f2..3f5ba97b70 100644 --- a/Makefile +++ b/Makefile @@ -2899,20 +2899,8 @@ ifdef MSVC # have already been rolled up into the exe's pdb file. # We DO NOT have pdb files for the builtin commands (like git-status.exe) # because it is just a copy/hardlink of git.exe, rather than a unique binary. - $(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) git-upload-pack.pdb '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-remote-testsvn.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-show-index.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' + $(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS),$(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)))) '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS) $(REMOTE_CURL_ALIASES),$(PROGRAMS))) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' ifndef DEBUG $(INSTALL) $(vcpkg_rel_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(vcpkg_rel_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)' From patchwork Mon Aug 17 09:07:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila_via_GitGitGadget?= X-Patchwork-Id: 11717439 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 50723722 for ; Mon, 17 Aug 2020 09:09:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2DF1F206C0 for ; Mon, 17 Aug 2020 09:09:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aYAM40kA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728003AbgHQJJo (ORCPT ); Mon, 17 Aug 2020 05:09:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728631AbgHQJH6 (ORCPT ); Mon, 17 Aug 2020 05:07:58 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2138C061345 for ; Mon, 17 Aug 2020 02:07:57 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id 88so14199537wrh.3 for ; Mon, 17 Aug 2020 02:07:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:in-reply-to:references:date:subject:mime-version :content-transfer-encoding:fcc:to; bh=vbvISUaPkKc4rrwX+xM60GRWfIbsVasmmRjcKlwh9Vk=; b=aYAM40kALf9QIw2R+vLlYzg0IrXyoB6DsRVO9roqOMc9pj3agyTbD69gF+sB8v6Fqy mcq7fBstCZ0U52BRdiWT0xMtN5WAJe4Bk+JYmnbLet8CnzAsFoKCU/eCni4JovhBoXQU 6Yu4LgXAB6tYzFAv+eOalSR/gft7ZMcsGSATXqhVL2MNZgsnm9X4VwvCT5c5y3cAmMLX sGZNa6/gpNAy4I643DIqM16l9w/4fHcJAAn1Xqgvy9hi5kEz04TUybSfvkCCIKciicDh seVOPU8ntHawfd6ITz2JgEi8UIyWJ84GxVVDCGwoiNauFUE8jGStfzCle0WI16JDBhii h6sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:mime-version:content-transfer-encoding:fcc:to; bh=vbvISUaPkKc4rrwX+xM60GRWfIbsVasmmRjcKlwh9Vk=; b=HMkrbvXtst5ynPrCulhUwva3EZ8H10aCRb1pycVyeNojHOIu+RGGxgdJMna/JprmA0 aTOw6XUu5GbUUHIaPSekM3b4UCxOHt1AwsbcyUs+Juxhdby5xPs0QEk9OtV5qaPn+Rc5 fG5i6dgu8mONhiaQf0v91qsE5zsKNiwjl8FNTjyXRP1WCSyc7dmaGDC7vy7lPeK9iUhW Lp6Sh5fbeGyOeSiy/9SCEo598gc8pvIMpm6v7F/PFnc8tWDnC2f6zJWfC9wiPPkIGPxJ yDKPny7QTzJvckQVhTNNJUZBiFh34gsfOAHYJWbHaEOP8bWcy17zDP9lg/NEJeCFZxmX O8pw== X-Gm-Message-State: AOAM531mkHzapb3pF8XqurIKsuL56VtES1bVyigOs2I8i+qG6MiX4N+s Gc9C+LtQPmRwdVNQMfaV7fTrvH6ENVc= X-Google-Smtp-Source: ABdhPJzJgQqm2fiRCUHDsBwYJb5kLEWjuQmNzQ4aqaokB1n+DCSaAk8G8u5bGDpZVAnfveaoyyZiZA== X-Received: by 2002:a5d:464a:: with SMTP id j10mr15053639wrs.187.1597655276399; Mon, 17 Aug 2020 02:07:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f9sm28207038wrm.62.2020.08.17.02.07.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 02:07:55 -0700 (PDT) From: Johannes Schindelin X-Google-Original-From: Johannes Schindelin Message-Id: <647f49d62e910fe8392219c3a5c6d86ac98a88e6.1597655273.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 17 Aug 2020 09:07:52 +0000 Subject: [PATCH 2/3] Optionally skip linking/copying the built-ins MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The dashed form of the built-ins is so passé. To save on development time, and to support the idea of eventually dropping the dashed form altogether, let's introduce a Makefile knob to skip generating those hard-links. Signed-off-by: Johannes Schindelin --- Makefile | 53 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 3f5ba97b70..2a355a4da8 100644 --- a/Makefile +++ b/Makefile @@ -348,6 +348,9 @@ all:: # Define NO_INSTALL_HARDLINKS if you prefer to use either symbolic links or # copies to install built-in git commands e.g. git-cat-file. # +# Define SKIP_DASHED_BUILT_INS if you do not need the dashed versions of the +# built-ins to be linked/copied at all. +# # Define USE_NED_ALLOCATOR if you want to replace the platforms default # memory allocators with the nedmalloc allocator written by Niall Douglas. # @@ -775,6 +778,16 @@ BUILT_INS += git-whatchanged$X # what 'all' will build and 'install' will install in gitexecdir, # excluding programs for built-in commands ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS) +ALL_PROGRAMS_AND_BUILT_INS = $(ALL_PROGRAMS) +ifeq (,$(SKIP_DASHED_BUILT_INS)) +ALL_PROGRAMS_AND_BUILT_INS += $(BUILT_INS) +else +# git-upload-pack, git-receive-pack and git-upload-archive are special: they +# are _expected_ to be present in the `bin/` directory in their dashed form. +ALL_PROGRAMS_AND_BUILT_INS += git-receive-pack$(X) +ALL_PROGRAMS_AND_BUILT_INS += git-upload-archive$(X) +ALL_PROGRAMS_AND_BUILT_INS += git-upload-pack$(X) +endif # what 'all' will build but not install in gitexecdir OTHER_PROGRAMS = git$X @@ -2066,9 +2079,9 @@ profile-fast: profile-clean $(MAKE) PROFILE=USE all -all:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS +all:: $(ALL_PROGRAMS_AND_BUILT_INS) $(SCRIPT_LIB) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS ifneq (,$X) - $(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';) + $(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS_AND_BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';) endif all:: @@ -2928,7 +2941,7 @@ ifndef NO_TCLTK $(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install endif ifneq (,$X) - $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';) + $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS_AND_BUILT_INS) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';) endif bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \ @@ -2946,21 +2959,27 @@ endif } && \ for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \ $(RM) "$$bindir/$$p" && \ - test -n "$(INSTALL_SYMLINKS)" && \ - ln -s "git$X" "$$bindir/$$p" || \ - { test -z "$(NO_INSTALL_HARDLINKS)" && \ - ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ - ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ - cp "$$bindir/git$X" "$$bindir/$$p" || exit; } \ + if test -z "$(SKIP_DASHED_BUILT_INS)"; \ + then \ + test -n "$(INSTALL_SYMLINKS)" && \ + ln -s "git$X" "$$bindir/$$p" || \ + { test -z "$(NO_INSTALL_HARDLINKS)" && \ + ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \ + ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \ + cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \ + fi \ done && \ for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ - test -n "$(INSTALL_SYMLINKS)" && \ - ln -s "$$destdir_from_execdir_SQ/$(bindir_relative_SQ)/git$X" "$$execdir/$$p" || \ - { test -z "$(NO_INSTALL_HARDLINKS)" && \ - ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ - ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ - cp "$$execdir/git$X" "$$execdir/$$p" || exit; } \ + if test -z "$(SKIP_DASHED_BUILT_INS)"; \ + then \ + test -n "$(INSTALL_SYMLINKS)" && \ + ln -s "$$destdir_from_execdir_SQ/$(bindir_relative_SQ)/git$X" "$$execdir/$$p" || \ + { test -z "$(NO_INSTALL_HARDLINKS)" && \ + ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \ + ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \ + cp "$$execdir/git$X" "$$execdir/$$p" || exit; }; \ + fi \ done && \ remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \ for p in $$remote_curl_aliases; do \ @@ -3051,7 +3070,7 @@ ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),) OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll) endif -artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \ +artifacts-tar:: $(ALL_PROGRAMS_AND_BUILT_INS) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \ GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \ $(MOFILES) $(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \ @@ -3146,7 +3165,7 @@ endif ### Check documentation # -ALL_COMMANDS = $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) +ALL_COMMANDS = $(ALL_PROGRAMS_AND_BUILT_INS) $(SCRIPT_LIB) ALL_COMMANDS += git ALL_COMMANDS += git-citool ALL_COMMANDS += git-gui From patchwork Mon Aug 17 09:07:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_Avila_via_GitGitGadget?= X-Patchwork-Id: 11717443 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CFF90739 for ; Mon, 17 Aug 2020 09:09:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B58842080D for ; Mon, 17 Aug 2020 09:09:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BMxPtlSm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726977AbgHQJJo (ORCPT ); Mon, 17 Aug 2020 05:09:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728653AbgHQJH7 (ORCPT ); Mon, 17 Aug 2020 05:07:59 -0400 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A84FC061346 for ; Mon, 17 Aug 2020 02:07:58 -0700 (PDT) Received: by mail-wr1-x442.google.com with SMTP id c15so14147183wrs.11 for ; Mon, 17 Aug 2020 02:07:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to; bh=ihGai2AY9Gy8QwmQXW3nx3AoRw0pY+Kkquo06oTffVE=; b=BMxPtlSmWYG1rX+waweGDNsRk90tp2HshxtvSd190BAI/zHGv/rdthUNQPTJLZ1yLK hcY+XdygvVjIR+iPdqT+w230Lw4OMXBXfjZaTlGq+AcaFsuvo4ZxbLZyuK+aWeP0b0no +YEASPddKVvWXNZxWJI9y+XWGQy8znNSNu8rLMtrXkUC562Zx5+ig611cQw72KPZeiLs gMKnBNFXPqChdWwFOlKnC6sJQriPGJDcDRVKQpKoUSxnw9u6D0ySXSJruF9XtoDfo/Rl pCKgpae0GFnIymDCb/QL58dovdA6AuUwknXjOVWEHwJmlDamTcmn/TqD70QJotf8YsyL xQ9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to; bh=ihGai2AY9Gy8QwmQXW3nx3AoRw0pY+Kkquo06oTffVE=; b=OkVwcGWoikdtWiM/XSi/3HZdfA5CL2lhJx8HH310h7jCYrude6XTQgTpiGulhTLQwY MUfkZlT2ZOMltpAC0ztSbZIClOMOThUbWaSm6E22yq7K6gijJewU120zN9cw5znGyFFb ZVRtEyQtzRkjUzZk9UbV/ort3kIHUBxAgrQUlgRA0J9q6tvJozaWfqoa1i1eayo8nT9q e+ZhxIQssh5Apv4N/XFZ92LOMvqTnjDI88WB1VC9YKP1xsPlWrlq8fdh/pZdX+C4IdSb iK8qYaJvm6fAsOcJYtg2+1gSnVBDn6JKkdaZNqclXNM6qgSGVpsDzdRKfBxUtnVKfXEU Dn8w== X-Gm-Message-State: AOAM531rthCzcNOlHSvEdhEbBfe+AEqQQ8utjFfsdDmUiIBiFBKL6i8/ HW3LwjiIMPNIpNdgDG+ke2njDvuKRDM= X-Google-Smtp-Source: ABdhPJxqcZs0vQ7ec5QdQXB1fyL58O8N9fTcoOqLUPPzRiPp6LnhnSNEJbUDaeV/rrdy+vVcpxVlXw== X-Received: by 2002:adf:e712:: with SMTP id c18mr14968756wrm.92.1597655277135; Mon, 17 Aug 2020 02:07:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r3sm28341657wro.1.2020.08.17.02.07.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 02:07:56 -0700 (PDT) From: Johannes Schindelin X-Google-Original-From: Johannes Schindelin Message-Id: <1269d7ace84b5d0e9a009044b49251cdf1dfbd23.1597655273.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 17 Aug 2020 09:07:53 +0000 Subject: [PATCH 3/3] ci: stop linking built-ins to the dashed versions Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Originally, all of Git's subcommands were implemented in their own executable/script, using the naming scheme `git-`. When more and more functionality was turned into built-in commands (i.e. the `git` executable could run them without spawning a separate process), for backwards-compatibility, we hard-link the `git` executable to `git-` for every built-in. This backwards-compatibility was needed to support scripts that called the dashed form, even if we deprecated that a _long_ time ago. In preparation for eventually dropping those hard-links, teach the CI (and PR) builds to skip generating those hard-links. Signed-off-by: Johannes Schindelin --- ci/run-build-and-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index 17e25aade9..b074db5c4b 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -10,7 +10,7 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";; *) ln -s "$cache_dir/.prove" t/.prove;; esac -make +make SKIP_DASHED_BUILT_INS=YesPlease case "$jobname" in linux-gcc) make test