diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-09-11 13:17:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-13 01:22:05 +0200 |
| commit | be8d370e3c0791e8b181ddc73cce37ff8356257c (patch) | |
| tree | 03522731f6e2ae9e69a9250990050e7c923db689 | |
| parent | git-submodule: remove unused is_zero_oid() function (diff) | |
| download | git-be8d370e3c0791e8b181ddc73cce37ff8356257c.tar.xz git-be8d370e3c0791e8b181ddc73cce37ff8356257c.zip | |
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>
| -rw-r--r-- | git-sh-setup.sh | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 10d9764185..cee053cdc3 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -223,9 +223,6 @@ require_clean_work_tree () { "rewrite branches") gettextln "Cannot rewrite branches: You have unstaged changes." >&2 ;; - "pull with rebase") - gettextln "Cannot pull with rebase: You have unstaged changes." >&2 - ;; *) eval_gettextln "Cannot \$action: You have unstaged changes." >&2 ;; @@ -242,9 +239,6 @@ require_clean_work_tree () { rebase) gettextln "Cannot rebase: Your index contains uncommitted changes." >&2 ;; - "pull with rebase") - gettextln "Cannot pull with rebase: Your index contains uncommitted changes." >&2 - ;; *) eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2 ;; |