git/git-sh-setup.sh, branch v2.45.3

git-sh-setup.sh: remove "say" function, change last users

2022-06-28T20:13:18Z

Remove the "say" function, with various rewrites of the remaining git-*.sh code to C and the preceding change to have git-submodule.sh stop using the GIT_QUIET variable there were only four uses in git-subtree.sh. Let's have it use an "arg_quiet" variable instead, and move the "say" function over to it. The only other use was a trivial message in git-instaweb.sh, since it has never supported the --quiet option (or similar) that code added in 0b624b4ceee (instaweb: restart server if already running, 2009-11-22) can simply use "echo" instead. The remaining in-tree hits from "say" are all for the sibling function defined in t/test-lib.sh. It's safe to remove this function since it has never been documented in Documentation/git-sh-setup.txt. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

git-submodule.sh: remove unused sanitize_submodule_env()

2022-06-28T20:13:16Z

The sanitize_submodule_env() function was last used before b3c5f5cb048 (submodule: move core cmd_update() logic to C, 2022-03-15), let's remove it. This also allows us to remove clear_local_git_env() from git-sh-setup.sh. That function hasn't been documented in Documentation/git-sh-setup.sh, and since 14111fc4927 (git: submodule honor -c credential.* from command line, 2016-02-29) it had only been used in the sanitize_submodule_env() function being removed here. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

git-sh-setup: remove remnant bits referring to `git-legacy-stash`

2022-01-28T02:00:09Z

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 Signed-off-by: Junio C Hamano

Merge branch 'ab/sh-retire-helper-functions'

2021-11-29T23:41:50Z

Make a few helper functions unused and then lose them. * ab/sh-retire-helper-functions: git-sh-setup: remove "sane_grep", it's not needed anymore git-sh-setup: remove unused sane_egrep() function git-instaweb: unconditionally assume that gitweb is mod_perl capable Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES) Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES) Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)

git-sh-setup: remove "sane_grep", it's not needed anymore

2021-10-21T23:17:57Z

Remove the sane_grep() shell function in git-sh-setup. The two reasons for why it existed don't apply anymore: 1. It was added due to GNU grep supporting GREP_OPTIONS. See e1622bfcbad (Protect scripted Porcelains from GREP_OPTIONS insanity, 2009-11-23). Newer versions of GNU grep ignore that, but even on older versions its existence won't matter, none of these sane_grep() uses care about grep's output, they're merely using it to check if a string exists in a file or stream. We also don't care about the "LC_ALL=C" that "sane_grep" was using, these greps for fixed or ASCII strings will behave the same under any locale. 2. The SANE_TEXT_GREP added in 71b401032b9 (sane_grep: pass "-a" if grep accepts it, 2016-03-08) isn't needed either, none of these grep uses deal with binary data. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

git-sh-setup: remove unused sane_egrep() function

2021-10-21T23:17:57Z

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. Unlike some other functions in git-sh-setup.sh, this function has not been documented in git-sh-setup(1), so per [1] it should be OK to remove it. I'm still unclear about the future of some of the other functions[2], but any questions in that area should not apply here. 1. https://lore.kernel.org/git/xmqqr1dtgnn8.fsf@gitster.g/ 1. https://lore.kernel.org/git/87tuiwjfvi.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

git-sh-setup: remove messaging supporting --preserve-merges

2021-10-21T23:04:29Z

Remove messages that were last used by the code removed in a74b35081c5 (rebase: drop support for `--preserve-merges`, 2021-09-07). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

git-sh-setup: remove unused "pull with rebase" message

2021-09-12T23:22:05Z

Remove the "pull with rebase" message previously used by the 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 Signed-off-by: Junio C Hamano

stash: optionally use the scripted version again

2019-03-07T00:41:40Z

We recently converted the `git stash` command from Unix shell scripts to builtins. Let's end users a way out when they discover a bug in the builtin command: `stash.useBuiltin`. As the file name `git-stash` is already in use, let's rename the scripted backend to `git-legacy-stash`. To make the test suite pass with `stash.useBuiltin=false`, this commit also backports rudimentary support for `-q` (but only *just* enough to appease the test suite), and adds a super-ugly hack to force exit code 129 for `git stash -h`. Signed-off-by: Johannes Schindelin Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

Merge branch 'va/i18n-even-more'

2016-12-27T08:11:45Z

* va/i18n-even-more: i18n: fix misconversion in shell scripts