mirror of
https://github.com/git/git.git
synced 2024-09-23 15:32:57 +02:00
git-sh-setup: remove messaging supporting --preserve-merges
Remove messages that were last used by the code removed in
a74b35081c
(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>
This commit is contained in:
parent
e29099a2d1
commit
c1e10b2dce
@ -217,9 +217,6 @@ require_clean_work_tree () {
|
|||||||
then
|
then
|
||||||
action=$1
|
action=$1
|
||||||
case "$action" in
|
case "$action" in
|
||||||
rebase)
|
|
||||||
gettextln "Cannot rebase: You have unstaged changes." >&2
|
|
||||||
;;
|
|
||||||
"rewrite branches")
|
"rewrite branches")
|
||||||
gettextln "Cannot rewrite branches: You have unstaged changes." >&2
|
gettextln "Cannot rewrite branches: You have unstaged changes." >&2
|
||||||
;;
|
;;
|
||||||
@ -235,14 +232,7 @@ require_clean_work_tree () {
|
|||||||
if test $err = 0
|
if test $err = 0
|
||||||
then
|
then
|
||||||
action=$1
|
action=$1
|
||||||
case "$action" in
|
eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
|
||||||
rebase)
|
|
||||||
gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
else
|
else
|
||||||
gettextln "Additionally, your index contains uncommitted changes." >&2
|
gettextln "Additionally, your index contains uncommitted changes." >&2
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user