threads / patch / 56750

patch, 2 partsremove code that's dead post-rebase --preserve-merges removal

Subject: [PATCH 0/2] remove code that's dead post-rebase --preserve-merges removal

## tl;dr

3 messages between Oct 21, 2021 and Oct 21, 2021. Diffs are folded; open one to read it.

replies: 2people: 1as markdown or json

Ævar Arnfjörð Bjarmason· Oct 21, 2021, 18:37 UTC · lore

A small follow-up to the now-landed "git rebase --preserve-merges" topic.

Ævar Arnfjörð Bjarmason (2):
  git-sh-i18n: remove unused eval_ngettext()
  git-sh-setup: remove messaging supporting --preserve-merges

 git-sh-i18n.sh  | 12 ------------
 git-sh-setup.sh | 12 +-----------
 2 files changed, 1 insertion(+), 23 deletions(-)

-- 
2.33.1.1494.g88b39a443e1

Ævar Arnfjörð Bjarmason· Oct 21, 2021, 18:37 UTC · re: Ævar Arnfjörð Bjarmason · lore

[PATCH 2/2] 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>
---
 git-sh-setup.sh | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

Show changes to git-sh-setup.sh +1 −11

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index cee053cdc38..960982f9d53 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

-- 
2.33.1.1494.g88b39a443e1

Ævar Arnfjörð Bjarmason· Oct 21, 2021, 18:37 UTC · re: Ævar Arnfjörð Bjarmason · lore

[PATCH 1/2] git-sh-i18n: remove unused eval_ngettext()

The "eval_ngettext()" function has been orphaned since its last user was removed in a74b35081c5 (rebase: drop support for `--preserve-merges`, 2021-09-07).

See b8fc9e43a7d (i18n: rebase-interactive: mark here-doc strings for translation, 2016-06-17) for the commit that added these eval_ngettext() wrappers.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-sh-i18n.sh | 12 ------------
 1 file changed, 12 deletions(-)

Show changes to git-sh-i18n.sh +0 −12

diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index e3d9f4836db..a15c0620db6 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -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 () {
@@ -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

-- 
2.33.1.1494.g88b39a443e1