From patchwork Thu Jan 27 22:03:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12727477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86638C433EF for ; Thu, 27 Jan 2022 22:03:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242107AbiA0WD4 (ORCPT ); Thu, 27 Jan 2022 17:03:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230245AbiA0WDz (ORCPT ); Thu, 27 Jan 2022 17:03:55 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49583C061714 for ; Thu, 27 Jan 2022 14:03:55 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id v123so2932903wme.2 for ; Thu, 27 Jan 2022 14:03:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=PelSFQVpQLFNIKq/2LDMyrLyUPU3gsfPQHV5mjoS3iA=; b=IxXRYmIvzMxMbR+WX0lfVuERL56ZImIpa+RiI5Zuv9cEWuoma7HDSKYWbbEgN8yLPZ xx4k56iT9uvP4vTgKB9n5/nnN32wrOPmQ2/ujUHL9YpBTGLVm508hjhNxRDbHjdMizvu vP+WFxiMR9CwaPhhBdMDXvp7PWJbSLRVVqbV2UEKASOYNdNxmZLrYxmvjHvagNtndGin pweJh/kQCxVNmeD1D7s/5ZjBxKogE8b7/NK9Jl8lA0wy4aaKehhIEQFbEPPRQ+qPARzm E2H6yfT8b/pAshnjHeAwJjenIxywtbEJ9Atguhnr8Mdtu4xyVyruSd+427D16OSfv67E INog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=PelSFQVpQLFNIKq/2LDMyrLyUPU3gsfPQHV5mjoS3iA=; b=ZK64/5Y2psYmqsEfh/UW/WRlF/ic9lSeRfKJ32rHDo3FMiETgtKMPn2OicnCw4qTu7 TCUCv+pu7VfLiPk7pq0arxo7Y5AKIVKIH652fWY2J4wpCcwykET7pcFDC0gTRq5MsihS Stcll7OEdwUk+U9jlBcfubkZ3kK4H72j6UsAO4z4pIIoJa0hUMG5jJnT+iScW02oZdre i4fSeOtCYuNjlWJ9lPU165zMNnvNZD7wFwzwzFCTJKayJ6/3/yJ/9P0acTcoWJ43Hv59 512EkRb8vb7O0lhBMQIiY6o6YGVerIziDYcRkRSM6WKsTrMUbjqjhY0ZcI6BMHx90d89 LPzw== X-Gm-Message-State: AOAM531yGxewxFnRYqonoSxMKO6xbgwIwiAeu5xmtskO8iNIYZZZL158 LKJt3LjE1gFKFkbGPcyLh/dMu8ZrYA4= X-Google-Smtp-Source: ABdhPJwKa0CobVflLUgo8jsolc4vU92UMppvEPZ5q6lGdzNChnp6cxLkfyj9DWTWKT2Cf7+00WJLXw== X-Received: by 2002:a05:600c:34c6:: with SMTP id d6mr10104691wmq.103.1643321033732; Thu, 27 Jan 2022 14:03:53 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j5sm2953197wrq.31.2022.01.27.14.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 14:03:53 -0800 (PST) Message-Id: <78676cee5f75e7928ce31e929b872f50b6819e51.1643321031.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 27 Jan 2022 22:03:48 +0000 Subject: [PATCH 1/4] git-sh-setup: remove remnant bits referring to `git-legacy-stash` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In 8a2cd3f5123 (stash: remove the stash.useBuiltin setting, 2020-03-03), we removed `git-legacy-stash.sh`. But `git-sh-setup.sh` somehow still thinks about it. Let's just not. Signed-off-by: Johannes Schindelin --- git-sh-setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/git-sh-setup.sh b/git-sh-setup.sh index b93f39288ce..d92df37e992 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -101,7 +101,6 @@ $LONG_USAGE")" case "$1" in -h) echo "$LONG_USAGE" - case "$0" in *git-legacy-stash) exit 129;; esac exit esac fi From patchwork Thu Jan 27 22:03:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12727478 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CB65C433F5 for ; Thu, 27 Jan 2022 22:03:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242109AbiA0WD5 (ORCPT ); Thu, 27 Jan 2022 17:03:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241948AbiA0WD4 (ORCPT ); Thu, 27 Jan 2022 17:03:56 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1536BC06173B for ; Thu, 27 Jan 2022 14:03:56 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id s18so7227077wrv.7 for ; Thu, 27 Jan 2022 14:03:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=IQ5jWY+xYlcNn4NI1yM8DBqVyn55ObKSQu1zGQxHLuI=; b=J8fWzEfH6lUr/BCWKYXJJ6TdGthvoEeHWITUSqNHxgPpizjd2E9FOO9u0StCem7pys 0hJ5vOT3D8QiP2rYgnbhgb6XzExJauoUGHCHIYgKCBlFqmdKyTzCN8eCsQI+AbEfsBEd tyMFn96Vg271w9qJIAtJDIENcSpQMWwk2xGF6XmcFEVs5OPXQcFACRvb1pav4Mzgku05 OqsGZKjbHbKzLQWPYIz4i18DF3pUb93HnPB2rkDTCZPD0URBkBcgyD/BVNp3oKtES0vW 0HqWceyG29By920vbzllBN2lXvIsY3wtF/u4UafNNRVbTafwpqVZAKOpkSJFclMNRVpG IrKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=IQ5jWY+xYlcNn4NI1yM8DBqVyn55ObKSQu1zGQxHLuI=; b=O3yYzhbmWAbbIM6euRw+ghaurolIPX9tvEdlu9qj2fDEL8MrUFqdqOGAuijg1UPehM iER+07bkcOYX9OBHodY0j8F2w7W2YoOpBsxyjI8+VFvhVAKEPtkOv7Fxugvu13RU41mK qTp9YakBXopPly/aRDDpKcpXdQCFmrMQhs7yWxZjvoGu7x+UUD6Eal8bIbhInR15eE1o 9bI1n8HS6xfPngt5APaeOc0y11Y/GT95AVPhBMmOX5mn5qlCdSAzy6VVrqVrNgGySbHv HxQjdT/pOylLqQ2ZZub+zJOrG+eCVYcCf46i7c6XJHpdnAGGdgNha6nTjFmhNFyFHcE/ gaiQ== X-Gm-Message-State: AOAM533CfV9VYFQGMvMXbAW3EKPyylAveEpMGYGAXNezHLjuytFPpjkE iIXjM7QiUmGAtaJRci7uJQq1GJj/0vk= X-Google-Smtp-Source: ABdhPJzu4IQB34nqiQFukbdx2wSaD61x5qxd0FDDBX5FGKe1nXvY9Vgw/uXwECbt/IlsKiiFB6Tw5A== X-Received: by 2002:a05:6000:1ac8:: with SMTP id i8mr4538465wry.136.1643321034552; Thu, 27 Jan 2022 14:03:54 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g4sm3612971wrd.111.2022.01.27.14.03.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 14:03:54 -0800 (PST) Message-Id: <0e6625fed2a8d1c7c842234e946af19c69950eb7.1643321031.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 27 Jan 2022 22:03:49 +0000 Subject: [PATCH 2/4] add: remove support for `git-legacy-stash` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In 90a6bb98d11 (legacy stash -p: respect the add.interactive.usebuiltin setting, 2019-12-21), we added support to use the built-in `add -p` from the scripted `stash -p`. In 8a2cd3f5123 (stash: remove the stash.useBuiltin setting, 2020-03-03), we retired the scripted `stash` (including the scripted `stash -p`). Therefore this support is no longer necessary. Signed-off-by: Johannes Schindelin --- builtin/add.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/builtin/add.c b/builtin/add.c index 84dff3e7969..3ffb86a4338 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -32,7 +32,6 @@ static int add_renormalize; static int pathspec_file_nul; static int include_sparse; static const char *pathspec_from_file; -static int legacy_stash_p; /* support for the scripted `git stash` */ struct update_callback_data { int flags; @@ -388,8 +387,6 @@ static struct option builtin_add_options[] = { N_("override the executable bit of the listed files")), OPT_HIDDEN_BOOL(0, "warn-embedded-repo", &warn_on_embedded_repo, N_("warn when adding an embedded repository")), - OPT_HIDDEN_BOOL(0, "legacy-stash-p", &legacy_stash_p, - N_("backend for `git stash -p`")), OPT_PATHSPEC_FROM_FILE(&pathspec_from_file), OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul), OPT_END(), @@ -512,17 +509,6 @@ int cmd_add(int argc, const char **argv, const char *prefix) die(_("options '%s' and '%s' cannot be used together"), "--pathspec-from-file", "--interactive/--patch"); exit(interactive_add(argv + 1, prefix, patch_interactive)); } - if (legacy_stash_p) { - struct pathspec pathspec; - - parse_pathspec(&pathspec, 0, - PATHSPEC_PREFER_FULL | - PATHSPEC_SYMLINK_LEADING_PATH | - PATHSPEC_PREFIX_ORIGIN, - prefix, argv); - - return run_add_interactive(NULL, "--patch=stash", &pathspec); - } if (edit_interactive) { if (pathspec_from_file) From patchwork Thu Jan 27 22:03:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12727479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DA48C433FE for ; Thu, 27 Jan 2022 22:03:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243050AbiA0WD6 (ORCPT ); Thu, 27 Jan 2022 17:03:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243121AbiA0WD5 (ORCPT ); Thu, 27 Jan 2022 17:03:57 -0500 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E78C4C061747 for ; Thu, 27 Jan 2022 14:03:56 -0800 (PST) Received: by mail-wm1-x329.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso6845788wmj.2 for ; Thu, 27 Jan 2022 14:03:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=BfAlWV34H5VQG7iupCZfkkUC148jP4TKM9b5OnmUizk=; b=DSDa8EwzZhGIJSCP+cd+phaT1+WbszN1UZ/4xoM4Tr/n8BdzR5Zx8Zc6R0ZsG4wd7S gp77jOrn0zuDWJpjdgD9M9WmyamAe1teFs3e8PB9SeqFb6ZW01jYSM/V5YoAPgihMnwp L81pmxa1FEnX6hSYWpxJ59MiPCME/X+YUhO0wbApIRbvp1AyyehtOt3PzuiwnknOZMhW 1oHuVaAJ3eSHJvTrCJ/Pkwcribx7c2J/S5Do83p93lw90hNr6n1G1MPyWPex7l8Kqr+v 7OdcMiW9jLlXM6tD64o0KTJMc/Nqrc+fvj7ZyID7KEEDu3pGxFiq6Z9SFFb3+mrC8SV7 qwvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=BfAlWV34H5VQG7iupCZfkkUC148jP4TKM9b5OnmUizk=; b=b89l9J5C3qHMrtiXYI7rVARGbzXGnsPw/f7juIpdC8kGQP+wfeLgm4A4M1W5FEo51F +Xa9JxP7NHTk9nBI4LeXUZZfpcsd8UTSGFDwWv/6G685lcBJ3YR7b92fKbYiPr87XMgQ IZ3MX4JE7Jvg0bSV9+5zjIVY2Ekip9vylX0X5OYHHKcecULM4pnAa992tK1wqWeFCe44 ws/XfQnKMgyNP8AN7ToDVys9JsGy8v7q4YlzNVsxU8f7Wnt2DaHGk7trDBTzRji2sm0s tRP/MZtwM9jyKv0htVGj3amiN6uWEDTLvBMHBh61CV0uspnMN00PH0blXmzUNmGczXT4 urZw== X-Gm-Message-State: AOAM532Qdt8GGVlBWvSqnbqBwdrwb9oeLKVEA3LSu8+Dub1Li7b+P8Os PMMl8rY63t62kgfoGRDl4RP6HSI3r+g= X-Google-Smtp-Source: ABdhPJzcimKcfoOYY4oHcktxYOnIKJdFmKD5cemvzK8EN3B8aqy57gx81ZealOj/iqWjsf9hAuSBBg== X-Received: by 2002:a05:600c:3845:: with SMTP id s5mr13483639wmr.134.1643321035361; Thu, 27 Jan 2022 14:03:55 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u17sm388366wmq.41.2022.01.27.14.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 14:03:54 -0800 (PST) Message-Id: In-Reply-To: References: Date: Thu, 27 Jan 2022 22:03:50 +0000 Subject: [PATCH 3/4] Remove documentation for `stash.useBuiltin` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In 8a2cd3f5123 (stash: remove the stash.useBuiltin setting, 2020-03-03), we removed the setting, and for a couple of major versions, we still documented the setting, telling users that it is gone. We can now safely remove even the documentation. Signed-off-by: Johannes Schindelin --- Documentation/config/stash.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt index 9ed775281fb..b9f609ed76b 100644 --- a/Documentation/config/stash.txt +++ b/Documentation/config/stash.txt @@ -1,10 +1,3 @@ -stash.useBuiltin:: - Unused configuration variable. Used in Git versions 2.22 to - 2.26 as an escape hatch to enable the legacy shellscript - implementation of stash. Now the built-in rewrite of it in C - is always used. Setting this will emit a warning, to alert any - remaining users that setting this now does nothing. - stash.showIncludeUntracked:: If this is set to true, the `git stash show` command will show the untracked files of a stash entry. Defaults to false. See From patchwork Thu Jan 27 22:03:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12727480 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC815C433EF for ; Thu, 27 Jan 2022 22:04:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243544AbiA0WD7 (ORCPT ); Thu, 27 Jan 2022 17:03:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241948AbiA0WD5 (ORCPT ); Thu, 27 Jan 2022 17:03:57 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9EBBEC061714 for ; Thu, 27 Jan 2022 14:03:57 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so2776563wme.0 for ; Thu, 27 Jan 2022 14:03:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=6Q7F4C8AWG73GonN9Ck7xmdK9K4fYGIcHPfj8k8h1/A=; b=OHvziAJ6F96o6yOMM13GShSFtE/WNusy5h6NXONIk0T/abFEh0oPJwLu3tendBtzPb FvpnhB4njZyiSdQiAu0BpYBQepzyNf9JO+K368hZ7SdNB+ge52ac4BKTEjGgVFi0Li9B hSLoRBdrWL+Kej3Icxp4Ya/dyJoh7Cp88pLVyAyKLfUqMc5qS/yc8o5jWRw9RdVsZ2uu /0U4vRIAa4sTOsUchwtwbrDkI6il+SpwGro+kDV554fkeiZ8PRYuMEpuNZSS00Lc9qID Z7dn7h3lqL80JYWxwQn9T9QlV94BzM49DC65yxZFtPP3Abnw394riVrQvvqc40X1oEg+ fOtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=6Q7F4C8AWG73GonN9Ck7xmdK9K4fYGIcHPfj8k8h1/A=; b=gjwYmCApsAGh49wwsE7Kraf2ER+hSdeTNmYMAjqIkOVKBuBvuxG1myO8G90rmDolRP i+E/5H23RTDcVAI/D8ZGHdbCTlJubQdcpihCuxoWzlLjqRye6WOdaaB4QlV+3+LX5fev e/kNtcM9HkLlwvJNRyxZ9KfY0zmtkQEOiTfOpqUMlta/6twymjZwUTP1EuIpt4mFqSS9 W1nJDvYY+qnw0EMtoTWmWrjHnf1NAcVK/UXOmeR1Mddg+4LW2csQgzX+e5RTxRtID/II Gure/SyQ8Ax87c31oJvs2dsCWqJ/55x0m6XXsV44FX4n5PEDa+Lstb1oGpUOFtHMrJ8C cF9A== X-Gm-Message-State: AOAM530KX+FPOwSI7mUP2hL1r8qqEDl3W76LAxXdTrMfjs3NepTGOJ5v famFO9AooyWTmfj4X77NFJKJcq/DomQ= X-Google-Smtp-Source: ABdhPJyZBzJJrMNt+gQnDNpG1AI8OZqT4cd33YHGWQsB8bewBdmPGOzqX8CwUyt+hwNV8+qAUTfpXQ== X-Received: by 2002:a7b:cbce:: with SMTP id n14mr13370033wmi.90.1643321036090; Thu, 27 Jan 2022 14:03:56 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c11sm3942687wri.43.2022.01.27.14.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 14:03:55 -0800 (PST) Message-Id: <047a63173775d309e8d88c60b58d7756be5c0900.1643321031.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 27 Jan 2022 22:03:51 +0000 Subject: [PATCH 4/4] stash: stop warning about the obsolete `stash.useBuiltin` config setting Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In 8a2cd3f5123 (stash: remove the stash.useBuiltin setting, 2020-03-03), we removed support for `stash.useBuiltin`, but left a warning in its place. After almost two years, and several major versions, it is time to remove even that warning. Signed-off-by: Johannes Schindelin --- builtin/stash.c | 10 ---------- t/t3903-stash.sh | 15 --------------- 2 files changed, 25 deletions(-) diff --git a/builtin/stash.c b/builtin/stash.c index 1ef2017c595..25793b5a75a 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -788,7 +788,6 @@ static int list_stash(int argc, const char **argv, const char *prefix) static int show_stat = 1; static int show_patch; static int show_include_untracked; -static int use_legacy_stash; static int git_stash_config(const char *var, const char *value, void *cb) { @@ -804,10 +803,6 @@ static int git_stash_config(const char *var, const char *value, void *cb) show_include_untracked = git_config_bool(var, value); return 0; } - if (!strcmp(var, "stash.usebuiltin")) { - use_legacy_stash = !git_config_bool(var, value); - return 0; - } return git_diff_basic_config(var, value, cb); } @@ -1778,11 +1773,6 @@ int cmd_stash(int argc, const char **argv, const char *prefix) git_config(git_stash_config, NULL); - if (use_legacy_stash || - !git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1)) - warning(_("the stash.useBuiltin support has been removed!\n" - "See its entry in 'git help config' for details.")); - argc = parse_options(argc, argv, prefix, options, git_stash_usage, PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH); diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 686747e55a3..b149e2af441 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -1272,7 +1272,6 @@ test_expect_success 'stash works when user.name and user.email are not set' ' >2 && git add 2 && test_config user.useconfigonly true && - test_config stash.usebuiltin true && ( sane_unset GIT_AUTHOR_NAME && sane_unset GIT_AUTHOR_EMAIL && @@ -1323,20 +1322,6 @@ test_expect_success 'stash handles skip-worktree entries nicely' ' git rev-parse --verify refs/stash:A.t ' -test_expect_success 'stash -c stash.useBuiltin=false warning ' ' - expected="stash.useBuiltin support has been removed" && - - git -c stash.useBuiltin=false stash 2>err && - test_i18ngrep "$expected" err && - env GIT_TEST_STASH_USE_BUILTIN=false git stash 2>err && - test_i18ngrep "$expected" err && - - git -c stash.useBuiltin=true stash 2>err && - test_must_be_empty err && - env GIT_TEST_STASH_USE_BUILTIN=true git stash 2>err && - test_must_be_empty err -' - test_expect_success 'git stash succeeds despite directory/file change' ' test_create_repo directory_file_switch_v1 && (