git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	"Eric Wong" <e@80x24.org>,
	"Prathamesh Chavan" <pc44800@gmail.com>,
	"Peter Baumann" <peter.baumann@gmail.com>,
	"Philippe Blain" <levraiphilippeblain@gmail.com>,
	"Andrei Rybak" <rybak.a.v@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v3 0/4] remove dead & internal-only shell code
Date: Sat, 11 Sep 2021 13:17:47 +0200	[thread overview]
Message-ID: <cover-v3-0.4-00000000000-20210911T111435Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-v2-0.7-00000000000-20210906T070201Z-avarab@gmail.com>

Per the discussion on v1 and v2 I've reduced the size of this series
to only those changes that should be uncontroversial to remove, even
by the harshest standards of maintaining compatibility with
out-of-tree users of undocumented functions in git's shell libraries.

Now we remove is_zero_oid() from git-submodule.sh, but not the
sane_egrep() from git-sh-setup.sh, git_pager() also stays, so does
peel_committish() and clear_local_git_env().

I think we can keep 2/4 ad remove the "pull with rebase" message,
since as noted there the worst case is that someone will lose only
that part of their translation.

And finally, the 3/4 and 4/4 are the same cleanups of internal-only or
test-only OID-matching variables as before.

Ævar Arnfjörð Bjarmason (4):
  git-submodule: remove unused is_zero_oid() function
  git-sh-setup: remove unused "pull with rebase" message
  git-bisect: remove unused SHA-1 $x40 shell variable
  test-lib: remove unused $_x40 and $_z40 variables

 git-bisect.sh    | 2 --
 git-sh-setup.sh  | 6 ------
 git-submodule.sh | 5 -----
 t/test-lib.sh    | 6 ++----
 4 files changed, 2 insertions(+), 17 deletions(-)

Range-diff against v2:
1:  8eb1dfbff5d < -:  ----------- git-sh-setup: remove unused git_pager() function
2:  e7f3115797c ! 1:  62b3a5881c9 git-sh-setup: remove unused sane_egrep() function
    @@ Metadata
     Author: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     
      ## Commit message ##
    -    git-sh-setup: remove unused sane_egrep() function
    +    git-submodule: remove unused is_zero_oid() function
     
         The is_zero_oid() function in git-submodule.sh has not been used since
         e83e3333b57 (submodule: port submodule subcommand 'summary' from shell
    -    to C, 2020-08-13), so we can remove it, and the sane_egrep() function,
    -    dead is_zero_oid() was the only function which still referenced it.
    +    to C, 2020-08-13), so we can remove it.
     
    -    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    +    This was the last user of the sane_egrep() function in
    +    git-sh-setup.sh. I'm not removing it in case some out-of-tree user
    +    relied on it. Per the discussion that can be found upthread of [1].
     
    - ## git-sh-setup.sh ##
    -@@ git-sh-setup.sh: sane_grep () {
    - 	GREP_OPTIONS= LC_ALL=C grep @@SANE_TEXT_GREP@@ "$@"
    - }
    - 
    --sane_egrep () {
    --	GREP_OPTIONS= LC_ALL=C egrep @@SANE_TEXT_GREP@@ "$@"
    --}
    --
    - is_bare_repository () {
    - 	git rev-parse --is-bare-repository
    - }
    +    1. https://lore.kernel.org/git/87tuiwjfvi.fsf@evledraar.gmail.com/
    +
    +    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     
      ## git-submodule.sh ##
     @@ git-submodule.sh: isnumber()
3:  d92e880fcfa < -:  ----------- git-sh-setup: move peel_committish() function to git-subtree.sh
4:  46c018aa860 < -:  ----------- git-sh-setup: clear_local_git_env() function to git-submodule.sh
5:  45c1369e958 ! 2:  db7223741ec git-sh-setup: remove unused "pull with rebase" message
    @@ Commit message
         git-pull.sh script, which was removed in 49eb8d39c78 (Remove
         contrib/examples/*, 2018-03-25).
     
    +    Even if some out-of-tree user copy/pasted the old git-pull.sh code,
    +    and relied on passing it a "pull with rebase" argument, we'll fall
    +    back on the "*" case here, they just won't get the "pull with rebase"
    +    part of their message translated.
    +
    +    I don't think it's likely that anyone out-of-tree relied on that, but
    +    I'm being conservative here per the discussion that can be found
    +    upthread of [1].
    +
    +    1. https://lore.kernel.org/git/87tuiwjfvi.fsf@evledraar.gmail.com/
    +
         Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
     
      ## git-sh-setup.sh ##
6:  bcae7884bb0 = 3:  cc2059f09f1 git-bisect: remove unused SHA-1 $x40 shell variable
7:  479e94f22f4 = 4:  206519c2d34 test-lib: remove unused $_x40 and $_z40 variables
-- 
2.33.0.984.gea2c3555113


  parent reply	other threads:[~2021-09-11 11:21 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-02 16:01 [PATCH 0/9] remove dead shell code Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 1/9] git-sh-setup: remove unused set_reflog_action() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 2/9] git-sh-setup: remove unused git_editor() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 3/9] git-sh-setup: remove unused git_pager() function Ævar Arnfjörð Bjarmason
2021-09-02 16:34   ` Philippe Blain
2021-09-02 21:13     ` Andrei Rybak
2021-09-02 16:01 ` [PATCH 4/9] git-sh-setup: remove unused sane_egrep() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 5/9] git-sh-setup: remove unused require_work_tree_exists() function Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 6/9] git-sh-setup: move create_virtual_base() to mergetools/p4merge Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 7/9] git-sh-setup: move peel_committish() function to git-subtree.sh Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 8/9] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-02 16:01 ` [PATCH 9/9] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason
2021-09-02 16:53 ` [PATCH 0/9] remove dead shell code Peter Baumann
2021-09-02 20:56   ` Junio C Hamano
2021-09-02 20:53 ` Junio C Hamano
2021-09-02 21:29   ` Carlo Arenas
2021-09-02 22:42     ` Junio C Hamano
2021-09-02 22:17   ` Ævar Arnfjörð Bjarmason
2021-09-02 22:36     ` Junio C Hamano
2021-09-06  7:05 ` [PATCH v2 0/7] remove dead & undocumented " Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 1/7] git-sh-setup: remove unused git_pager() function Ævar Arnfjörð Bjarmason
2021-09-06  9:49     ` Phillip Wood
2021-09-06 22:27       ` Ævar Arnfjörð Bjarmason
2021-09-07  9:41         ` Phillip Wood
2021-09-07 10:22           ` Ævar Arnfjörð Bjarmason
2021-09-07 18:37             ` Junio C Hamano
2021-09-07 19:58               ` Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 2/7] git-sh-setup: remove unused sane_egrep() function Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 3/7] git-sh-setup: move peel_committish() function to git-subtree.sh Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 4/7] git-sh-setup: clear_local_git_env() function to git-submodule.sh Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 5/7] git-sh-setup: remove unused "pull with rebase" message Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 6/7] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-06  7:05   ` [PATCH v2 7/7] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason
2021-09-11 11:17   ` Ævar Arnfjörð Bjarmason [this message]
2021-09-11 11:17     ` [PATCH v3 1/4] git-submodule: remove unused is_zero_oid() function Ævar Arnfjörð Bjarmason
2021-09-13  3:28       ` Junio C Hamano
2021-09-11 11:17     ` [PATCH v3 2/4] git-sh-setup: remove unused "pull with rebase" message Ævar Arnfjörð Bjarmason
2021-09-11 11:17     ` [PATCH v3 3/4] git-bisect: remove unused SHA-1 $x40 shell variable Ævar Arnfjörð Bjarmason
2021-09-11 11:17     ` [PATCH v3 4/4] test-lib: remove unused $_x40 and $_z40 variables Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover-v3-0.4-00000000000-20210911T111435Z-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=e@80x24.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=levraiphilippeblain@gmail.com \
    --cc=pc44800@gmail.com \
    --cc=peff@peff.net \
    --cc=peter.baumann@gmail.com \
    --cc=rybak.a.v@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).