test-ref-store: remove force-create argument for create-reflog

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

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index cee053cdc388a9390ef4c23730d334e0bba376db..b93f39288ce41f06b0e1f564d833a40f6c8577b9 100644 (file)
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -173,14 +173,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
 }
@@ -217,9 +209,6 @@ require_clean_work_tree () {
        then
                action=$1
                case "$action" in
-               rebase)
-                       gettextln "Cannot rebase: You have unstaged changes." >&2
-                       ;;
                "rewrite branches")
                        gettextln "Cannot rewrite branches: You have unstaged changes." >&2
                        ;;
@@ -235,14 +224,7 @@ require_clean_work_tree () {
                if test $err = 0
                then
                        action=$1
-                       case "$action" in
-                       rebase)
-                               gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
-                               ;;
-                       *)
-                               eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
-                               ;;
-                       esac
+                       eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
                else
                    gettextln "Additionally, your index contains uncommitted changes." >&2
                fi