git-sh-setup: remove unused "pull with rebase" message
Remove the "pull with rebase" message previously used by the git-pull.sh script, which was removed in 49eb8d39c78 (Remove contrib/examples/*, 2018-03-25). Even if some out-of-tree user copy/pasted the old git-pull.sh code, and relied on passing it a "pull with rebase" argument, we'll fall back on the "*" case here, they just won't get the "pull with rebase" part of their message translated. I don't think it's likely that anyone out-of-tree relied on that, but I'm being conservative here per the discussion that can be found upthread of [1]. 1. https://lore.kernel.org/git/87tuiwjfvi.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Sep 11, 2021 at 13:17 UTC
be8d370e3c0791e8b181ddc73cce37ff8356257c
1 file changed
-6
git-sh-setup.sh
-6
@@ -223,9 +223,6 @@ require_clean_work_tree () {
223
"rewrite branches")
224
gettextln "Cannot rewrite branches: You have unstaged changes." >&2
225
;;
226
- "pull with rebase")
227
- gettextln "Cannot pull with rebase: You have unstaged changes." >&2
228
- ;;
226
*)
227
eval_gettextln "Cannot \$action: You have unstaged changes." >&2
228
;;
@@ -242,9 +239,6 @@ require_clean_work_tree () {
239
rebase)
240
gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
241
;;
245
- "pull with rebase")
246
- gettextln "Cannot pull with rebase: Your index contains uncommitted changes." >&2
247
- ;;
242
*)
243
eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
244
;;