Skip to content

Commit be8d370

Browse files
avargitster
authored andcommitted
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 49eb8d3 (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/[email protected]/ Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 162410f commit be8d370

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

git-sh-setup.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,6 @@ require_clean_work_tree () {
223223
"rewrite branches")
224224
gettextln "Cannot rewrite branches: You have unstaged changes." >&2
225225
;;
226-
"pull with rebase")
227-
gettextln "Cannot pull with rebase: You have unstaged changes." >&2
228-
;;
229226
*)
230227
eval_gettextln "Cannot \$action: You have unstaged changes." >&2
231228
;;
@@ -242,9 +239,6 @@ require_clean_work_tree () {
242239
rebase)
243240
gettextln "Cannot rebase: Your index contains uncommitted changes." >&2
244241
;;
245-
"pull with rebase")
246-
gettextln "Cannot pull with rebase: Your index contains uncommitted changes." >&2
247-
;;
248242
*)
249243
eval_gettextln "Cannot \$action: Your index contains uncommitted changes." >&2
250244
;;

0 commit comments

Comments
 (0)