undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/sh-retire-rebase-preserve-merges'

Browse Source 
Code clean-up to remove unused helpers.

* ab/sh-retire-rebase-preserve-merges:
  git-sh-setup: remove messaging supporting --preserve-merges
  git-sh-i18n: remove unused eval_ngettext()
This commit is contained in:
Junio C Hamano 2021-10-29 15:43:13 -07:00
commit 942843e8dd
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-sh-i18n.sh
View File

@ -51,12 +51,6 @@ gettext_without_eval_gettext)
) )
} }
eval_ngettext () {
ngettext "$1" "$2" "$3" | (
export PATH $(git sh-i18n--envsubst --variables "$2");
git sh-i18n--envsubst "$2"
)
}
;; ;;
*) *)
gettext () { gettext () {
@ -70,12 +64,6 @@ gettext_without_eval_gettext)
) )
} }
eval_ngettext () {
(test "$3" = 1 && printf "%s" "$1" || printf "%s" "$2") | (
export PATH $(git sh-i18n--envsubst --variables "$2");
git sh-i18n--envsubst "$2"
)
}
;; ;;
esac esac

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