From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Thu, 21 Oct 2021 18:37:33 +0000 (+0200)
Subject: git-sh-setup: remove messaging supporting --preserve-merges
X-Git-Tag: v2.34.0-rc0~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1e10b2dce28b434127870ed09293cf9adc9fcc2;p=thirdparty%2Fgit.git

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

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>
---

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index cee053cdc3..960982f9d5 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -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