Start the 2.46 cycle

[thirdparty/git.git] / git-sh-setup.sh

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 960982f9d534f4984f4e372a1883899293c536ff..ce273fe0e48d997cb067e77707026616a9302eb2 100644 (file)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -57,15 +57,6 @@ die_with_status () {
        exit "$status"
 }
 
-GIT_QUIET=
-
-say () {
-       if test -z "$GIT_QUIET"
-       then
-               printf '%s\n' "$*"
-       fi
-}
-
 if test -n "$OPTIONS_SPEC"; then
        usage() {
                "$0" -h
@@ -101,7 +92,6 @@ $LONG_USAGE")"
        case "$1" in
                -h)
                echo "$LONG_USAGE"
-               case "$0" in *git-legacy-stash) exit 129;; esac
                exit
        esac
 fi
@@ -173,14 +163,6 @@ git_pager() {
        eval "$GIT_PAGER" '"$@"'
 }
 
-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
 }
@@ -294,13 +276,6 @@ get_author_ident_from_commit () {
        parse_ident_from_commit author AUTHOR
 }
 
-# Clear repo-local GIT_* environment variables. Useful when switching to
-# another repository (e.g. when entering a submodule). See also the env
-# list in git_connect()
-clear_local_git_env() {
-       unset $(git rev-parse --local-env-vars)
-}
-
 # Generate a virtual base file for a two-file merge. Uses git apply to
 # remove lines from $1 that are not in $2, leaving only common lines.
 create_virtual_base() {