diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-10-21 21:37:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-22 02:04:29 +0300 |
| commit | c1e10b2dce28b434127870ed09293cf9adc9fcc2 (patch) | |
| tree | 2b51b95341309d486a2f5186382dc21d05c01b24 /git-sh-setup.sh | |
| parent | e29099a2d17f7fdacc400503ef8a0303b560609a (diff) | |
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>
Diffstat (limited to 'git-sh-setup.sh')
| -rw-r--r-- | git-sh-setup.sh | 12 |
1 files changed, 1 insertions, 11 deletions
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 |