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>
Ævar Arnfjörð Bjarmason committed
Oct 21, 2021 at 20:37 UTC
c1e10b2dce28b434127870ed09293cf9adc9fcc2
1 file changed
+1
-11
git-sh-setup.sh
+1
-11
@@ -217,9 +217,6 @@ require_clean_work_tree () {
217
then
218
action=$1
219
case "$action" in
220
- rebase)
221
- gettextln "Cannot rebase: You have unstaged changes." >&2
222
- ;;
220
"rewrite branches")
221
gettextln "Cannot rewrite branches: You have unstaged changes." >&2
222
;;
@@ -235,14 +232,7 @@ require_clean_work_tree () {
232
if test $err = 0
233
then
234
action=$1
238
- case "$action" in
239
- rebase)
240
- gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
241
- ;;
242
- *)
243
- eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
244
- ;;
245
- esac
235
+ eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
236
else
237
gettextln "Additionally, your index contains uncommitted changes." >&2
238
fi