]> git.ipfire.org Git - thirdparty/git.git/commitdiff
git-sh-setup: remove messaging supporting --preserve-merges
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Thu, 21 Oct 2021 18:37:33 +0000 (20:37 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Oct 2021 23:04:29 +0000 (16:04 -0700)
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 <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-sh-setup.sh

index cee053cdc388a9390ef4c23730d334e0bba376db..960982f9d534f4984f4e372a1883899293c536ff 100644 (file)
@@ -217,9 +217,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 +232,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