git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 0/4] remove dead & internal-only shell code

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Sep 11, 2021, 11:17 UTC
Message-ID
<cover-v3-0.4-00000000000-20210911T111435Z-avarab@gmail.com>
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
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 34 of 39 in “remove dead shell code”
  1. 0/9 remove dead shell codeÆvar Arnfjörð Bjarmason, Sep 2, 2021
  2. 1/9 git-sh-setup: remove unused set_reflog_action() functionÆvar Arnfjörð Bjarmason, Sep 2, 2021
  3. 2/9 git-sh-setup: remove unused git_editor() functionÆvar Arnfjörð Bjarmason, Sep 2, 2021
  4. 3/9 git-sh-setup: remove unused git_pager() functionÆvar Arnfjörð Bjarmason, Sep 2, 2021
  5. Philippe BlainSep 2, 2021
  6. Andrei RybakSep 2, 2021
  7. 4/9 git-sh-setup: remove unused sane_egrep() functionÆvar Arnfjörð Bjarmason, Sep 2, 2021
  8. 5/9 git-sh-setup: remove unused require_work_tree_exists() functionÆvar Arnfjörð Bjarmason, Sep 2, 2021
  9. 6/9 git-sh-setup: move create_virtual_base() to mergetools/p4mergeÆvar Arnfjörð Bjarmason, Sep 2, 2021
  10. 7/9 git-sh-setup: move peel_committish() function to git-subtree.shÆvar Arnfjörð Bjarmason, Sep 2, 2021
  11. 8/9 git-bisect: remove unused SHA-1 $x40 shell variableÆvar Arnfjörð Bjarmason, Sep 2, 2021
  12. 9/9 test-lib: remove unused $_x40 and $_z40 variablesÆvar Arnfjörð Bjarmason, Sep 2, 2021
  13. Peter BaumannSep 2, 2021
  14. Junio C HamanoSep 2, 2021
  15. Junio C HamanoSep 2, 2021
  16. Carlo ArenasSep 2, 2021
  17. Junio C HamanoSep 2, 2021
  18. Ævar Arnfjörð BjarmasonSep 2, 2021
  19. Junio C HamanoSep 2, 2021
  20. 0/7 remove dead & undocumented shell codeÆvar Arnfjörð Bjarmason, Sep 6, 2021
  21. 2/7 git-sh-setup: remove unused sane_egrep() functionÆvar Arnfjörð Bjarmason, Sep 6, 2021
  22. 3/7 git-sh-setup: move peel_committish() function to git-subtree.shÆvar Arnfjörð Bjarmason, Sep 6, 2021
  23. 1/7 git-sh-setup: remove unused git_pager() functionÆvar Arnfjörð Bjarmason, Sep 6, 2021
  24. Phillip WoodSep 6, 2021
  25. Ævar Arnfjörð BjarmasonSep 6, 2021
  26. Phillip WoodSep 7, 2021
  27. Ævar Arnfjörð BjarmasonSep 7, 2021
  28. Junio C HamanoSep 7, 2021
  29. Ævar Arnfjörð BjarmasonSep 7, 2021
  30. 5/7 git-sh-setup: remove unused "pull with rebase" messageÆvar Arnfjörð Bjarmason, Sep 6, 2021
  31. 4/7 git-sh-setup: clear_local_git_env() function to git-submodule.shÆvar Arnfjörð Bjarmason, Sep 6, 2021
  32. 6/7 git-bisect: remove unused SHA-1 $x40 shell variableÆvar Arnfjörð Bjarmason, Sep 6, 2021
  33. 7/7 test-lib: remove unused $_x40 and $_z40 variablesÆvar Arnfjörð Bjarmason, Sep 6, 2021
  34. 0/4 remove dead & internal-only shell codeÆvar Arnfjörð Bjarmason, Sep 11, 2021
  35. 2/4 git-sh-setup: remove unused "pull with rebase" messageÆvar Arnfjörð Bjarmason, Sep 11, 2021
  36. 1/4 git-submodule: remove unused is_zero_oid() functionÆvar Arnfjörð Bjarmason, Sep 11, 2021
  37. Junio C HamanoSep 13, 2021
  38. 3/4 git-bisect: remove unused SHA-1 $x40 shell variableÆvar Arnfjörð Bjarmason, Sep 11, 2021
  39. 4/4 test-lib: remove unused $_x40 and $_z40 variablesÆvar Arnfjörð Bjarmason, Sep 11, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.