kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Ævar Arnfjörð Bjarmason 2021-10-21 20:37:33 +02:00 committed by Junio C Hamano
parent e29099a2d1
commit c1e10b2dce
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-sh-setup.sh
View File

@ -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
rebase)
gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
;;
*)
eval_gettextln "Cannot \$action: 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