Skip to content

Commit c1e10b2

Browse files
avargitster
authored andcommitted
git-sh-setup: remove messaging supporting --preserve-merges
Remove messages that were last used by the code removed in a74b350 (rebase: drop support for `--preserve-merges`, 2021-09-07). Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e29099a commit c1e10b2

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

git-sh-setup.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,6 @@ require_clean_work_tree () {
217217
then
218218
action=$1
219219
case "$action" in
220-
rebase)
221-
gettextln "Cannot rebase: You have unstaged changes." >&2
222-
;;
223220
"rewrite branches")
224221
gettextln "Cannot rewrite branches: You have unstaged changes." >&2
225222
;;
@@ -235,14 +232,7 @@ require_clean_work_tree () {
235232
if test $err = 0
236233
then
237234
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
246236
else
247237
gettextln "Additionally, your index contains uncommitted changes." >&2
248238
fi

0 commit comments

Comments
 (0)