Remove code that was last used in the now-removed rebase.useBuiltin setting. See d03ebd411c ("rebase: remove the rebase.useBuiltin setting", 2019-03-18) for the removal of its last user. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- git-parse-remote.sh | 47 --------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 6b743cda17..e3f6195281 100644 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -48,50 +48,3 @@ get_remote_merge_branch () { esac esac } - -error_on_missing_default_upstream () { - cmd="$1" - op_type="$2" - op_prep="$3" # FIXME: op_prep is no longer used - example="$4" - branch_name=$(git symbolic-ref -q HEAD) - display_branch_name="${branch_name#refs/heads/}" - # If there's only one remote, use that in the suggestion - remote="$(gettext "<remote>")" - branch="$(gettext "<branch>")" - if test $(git remote | wc -l) = 1 - then - remote=$(git remote) - fi - - if test -z "$branch_name" - then - gettextln "You are not currently on a branch." - else - gettextln "There is no tracking information for the current branch." - fi - case "$op_type" in - rebase) - gettextln "Please specify which branch you want to rebase against." - ;; - merge) - gettextln "Please specify which branch you want to merge with." - ;; - *) - echo >&2 "BUG: unknown operation type: $op_type" - exit 1 - ;; - esac - eval_gettextln "See git-\${cmd}(1) for details." - echo - echo " $example" - echo - if test -n "$branch_name" - then - gettextln "If you wish to set tracking information for this branch you can do so with:" - echo - echo " git branch --set-upstream-to=$remote/$branch $display_branch_name" - echo - fi - exit 1 -} -- 2.29.2.222.g5d2a92d10f8