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@xxxxxxxxx>
## 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@xxxxxxxxx>
+ 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@xxxxxxxxxxxxxxxxxxx/
+
+ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
## 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@xxxxxxxxxxxxxxxxxxx/
+
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
## 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
