{"thread":{"id":"56750","subject":"[PATCH 0/2] remove code that's dead post-rebase --preserve-merges removal","startedAt":"2021-10-21T18:37:40Z","lastAt":"2021-10-21T18:37:42Z","messageCount":3,"participants":["Ævar Arnfjörð Bjarmason"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"439260","messageId":"cover-0.2-00000000000-20211021T183627Z-avarab@gmail.com","threadId":"56750","inReplyTo":null,"subject":"[PATCH 0/2] remove code that's dead post-rebase --preserve-merges removal","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-10-21T18:37:31Z","receivedAt":"2021-10-21T18:37:40Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"A small follow-up to the now-landed \"git rebase --preserve-merges\"\ntopic.\n\nÆvar Arnfjörð Bjarmason (2):\n  git-sh-i18n: remove unused eval_ngettext()\n  git-sh-setup: remove messaging supporting --preserve-merges\n\n git-sh-i18n.sh  | 12 ------------\n git-sh-setup.sh | 12 +-----------\n 2 files changed, 1 insertion(+), 23 deletions(-)\n\n-- \n2.33.1.1494.g88b39a443e1\n\n"},{"id":"439261","messageId":"patch-2.2-556cf184fc9-20211021T183627Z-avarab@gmail.com","threadId":"56750","inReplyTo":"cover-0.2-00000000000-20211021T183627Z-avarab@gmail.com","subject":"[PATCH 2/2] git-sh-setup: remove messaging supporting --preserve-merges","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-10-21T18:37:33Z","receivedAt":"2021-10-21T18:37:41Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"Remove messages that were last used by the code removed in\na74b35081c5 (rebase: drop support for `--preserve-merges`,\n2021-09-07).\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-sh-setup.sh | 12 +-----------\n 1 file changed, 1 insertion(+), 11 deletions(-)\n\ndiff --git a/git-sh-setup.sh b/git-sh-setup.sh\nindex cee053cdc38..960982f9d53 100644\n--- a/git-sh-setup.sh\n+++ b/git-sh-setup.sh\n@@ -217,9 +217,6 @@ require_clean_work_tree () {\n \tthen\n \t\taction=$1\n \t\tcase \"$action\" in\n-\t\trebase)\n-\t\t\tgettextln \"Cannot rebase: You have unstaged changes.\" >&2\n-\t\t\t;;\n \t\t\"rewrite branches\")\n \t\t\tgettextln \"Cannot rewrite branches: You have unstaged changes.\" >&2\n \t\t\t;;\n@@ -235,14 +232,7 @@ require_clean_work_tree () {\n \t\tif test $err = 0\n \t\tthen\n \t\t\taction=$1\n-\t\t\tcase \"$action\" in\n-\t\t\trebase)\n-\t\t\t\tgettextln \"Cannot rebase: Your index contains uncommitted changes.\" >&2\n-\t\t\t\t;;\n-\t\t\t*)\n-\t\t\t\teval_gettextln \"Cannot \\$action: Your index contains uncommitted changes.\" >&2\n-\t\t\t\t;;\n-\t\t\tesac\n+\t\t\teval_gettextln \"Cannot \\$action: Your index contains uncommitted changes.\" >&2\n \t\telse\n \t\t    gettextln \"Additionally, your index contains uncommitted changes.\" >&2\n \t\tfi\n-- \n2.33.1.1494.g88b39a443e1\n\n"},{"id":"439262","messageId":"patch-1.2-4552f2115d1-20211021T183627Z-avarab@gmail.com","threadId":"56750","inReplyTo":"cover-0.2-00000000000-20211021T183627Z-avarab@gmail.com","subject":"[PATCH 1/2] git-sh-i18n: remove unused eval_ngettext()","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-10-21T18:37:32Z","receivedAt":"2021-10-21T18:37:42Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"The \"eval_ngettext()\" function has been orphaned since its last user\nwas removed in a74b35081c5 (rebase: drop support for\n`--preserve-merges`, 2021-09-07).\n\nSee b8fc9e43a7d (i18n: rebase-interactive: mark here-doc strings for\ntranslation, 2016-06-17) for the commit that added these\neval_ngettext() wrappers.\n\nSigned-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n---\n git-sh-i18n.sh | 12 ------------\n 1 file changed, 12 deletions(-)\n\ndiff --git a/git-sh-i18n.sh b/git-sh-i18n.sh\nindex e3d9f4836db..a15c0620db6 100644\n--- a/git-sh-i18n.sh\n+++ b/git-sh-i18n.sh\n@@ -51,12 +51,6 @@ gettext_without_eval_gettext)\n \t\t)\n \t}\n \n-\teval_ngettext () {\n-\t\tngettext \"$1\" \"$2\" \"$3\" | (\n-\t\t\texport PATH $(git sh-i18n--envsubst --variables \"$2\");\n-\t\t\tgit sh-i18n--envsubst \"$2\"\n-\t\t)\n-\t}\n \t;;\n *)\n \tgettext () {\n@@ -70,12 +64,6 @@ gettext_without_eval_gettext)\n \t\t)\n \t}\n \n-\teval_ngettext () {\n-\t\t(test \"$3\" = 1 && printf \"%s\" \"$1\" || printf \"%s\" \"$2\") | (\n-\t\t\texport PATH $(git sh-i18n--envsubst --variables \"$2\");\n-\t\t\tgit sh-i18n--envsubst \"$2\"\n-\t\t)\n-\t}\n \t;;\n esac\n \n-- \n2.33.1.1494.g88b39a443e1\n\n"}]}