From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Stefan Beller" <stefanbeller@gmail.com>,
"Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 2/5] parse-remote: remove long-dead rebase code
Date: Wed, 11 Nov 2020 16:17:51 +0100 [thread overview]
Message-ID: <20201111151754.31527-3-avarab@gmail.com> (raw)
In-Reply-To: <CAGZ79kb57HzJQ4VLFD_NMKvEnriPVXoAAPimg6BG_Z+PPjJ4aQ@mail.gmail.com>
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@gmail.com>
---
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
next prev parent reply other threads:[~2020-11-11 15:18 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-11 13:47 [PATCH 00/11] Start retiring .git/remotes/ and .git/branches/ for good Johannes Schindelin
2017-05-11 13:47 ` [PATCH 01/11] git-parse-remote: fix highly misleading man page Johannes Schindelin
2017-05-11 17:21 ` Stefan Beller
2017-05-11 19:14 ` Johannes Schindelin
2020-11-11 15:17 ` [PATCH 0/5] Remove now-unused git-parse-remote Ævar Arnfjörð Bjarmason
2020-11-11 17:37 ` Jeff King
2020-11-11 19:29 ` Junio C Hamano
2020-11-12 14:09 ` Ævar Arnfjörð Bjarmason
2020-11-12 18:42 ` Jeff King
2020-11-12 14:19 ` How do I "git fetch" with a custom <refspec> but a default remote? Ævar Arnfjörð Bjarmason
2020-11-12 18:51 ` Jeff King
2020-11-12 19:26 ` Chris Torek
2020-11-12 20:48 ` Jeff King
2020-11-12 21:22 ` Junio C Hamano
2020-11-14 12:12 ` Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` [PATCH 1/5] parse-remote: remove unused GIT_DIR variable Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` Ævar Arnfjörð Bjarmason [this message]
2020-11-11 15:17 ` [PATCH 3/5] parse-remote: remove long-dead git-pull.sh code Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` [PATCH 4/5] parse-remote: move used code to git-submodule.sh Ævar Arnfjörð Bjarmason
2020-11-11 15:17 ` [PATCH 5/5] parse-remote: remove this now-unused library Ævar Arnfjörð Bjarmason
2020-11-11 16:33 ` Junio C Hamano
2020-11-12 20:31 ` [PATCH v2 0/2] Retire git-parse-remote Junio C Hamano
2020-11-12 20:31 ` [PATCH v2 1/2] parse-remote: move used code to git-submodule.sh Junio C Hamano
2020-11-12 20:31 ` [PATCH v2 2/2] parse-remote: remove this now-unused library Junio C Hamano
2020-11-12 20:49 ` [PATCH v2 0/2] Retire git-parse-remote Jeff King
2020-11-12 21:25 ` Junio C Hamano
2020-11-13 9:42 ` Ævar Arnfjörð Bjarmason
2020-11-14 12:21 ` [PATCH v3 0/3] submodule sh->C & retire parse-remote Ævar Arnfjörð Bjarmason
2020-11-14 12:21 ` [PATCH v3 1/3] submodule: use "fetch" logic instead of custom remote discovery Ævar Arnfjörð Bjarmason
2020-11-16 21:13 ` Junio C Hamano
2020-11-14 12:21 ` [PATCH v3 2/3] submodule: remove sh function in favor of helper Ævar Arnfjörð Bjarmason
2020-11-14 12:21 ` [PATCH v3 3/3] parse-remote: remove this now-unused library Ævar Arnfjörð Bjarmason
2020-11-16 21:19 ` Junio C Hamano
2020-11-17 14:24 ` Ævar Arnfjörð Bjarmason
2017-05-11 13:47 ` [PATCH 02/11] Documentation: really deprecate .git/remotes/ and .git/branches/ Johannes Schindelin
2017-05-11 13:47 ` [PATCH 03/11] remote: warn loud and clear when .git/branches/ is *still* used Johannes Schindelin
2017-05-11 13:47 ` [PATCH 04/11] remote: warn loud and clear when .git/remotes/ " Johannes Schindelin
2017-05-11 13:47 ` [PATCH 05/11] Revert "Revert "Don't create the $GIT_DIR/branches directory on init"" Johannes Schindelin
2017-05-11 17:26 ` Stefan Beller
2017-05-11 13:47 ` [PATCH 06/11] PREVIEW: t5510: convert .git/remotes/ test to use a regular remote Johannes Schindelin
2017-05-11 13:47 ` [PATCH 07/11] PREVIEW: t5516: stop testing .git/branches/ functionality Johannes Schindelin
2017-05-11 13:47 ` [PATCH 08/11] PREVIEW: remote: remove support for migrating ancient remotes Johannes Schindelin
2017-05-11 13:48 ` [PATCH 09/11] PREVIEW: t5515: remove .git/remotes/ and .git/branches/ tests Johannes Schindelin
2017-05-11 13:48 ` [PATCH 10/11] PREVIEW: t0060: stop testing support for .git/remotes/ and .git/branches/ Johannes Schindelin
2017-05-11 13:48 ` [PATCH 11/11] PREVIEW: remove " Johannes Schindelin
2017-05-11 18:19 ` Stefan Beller
2017-05-11 19:19 ` Johannes Schindelin
2017-05-12 1:14 ` [PATCH 00/11] Start retiring .git/remotes/ and .git/branches/ for good Junio C Hamano
2017-05-12 10:18 ` Johannes Schindelin
2017-05-16 0:37 ` Junio C Hamano
2017-05-16 8:05 ` Ævar Arnfjörð Bjarmason
2017-05-16 9:06 ` Junio C Hamano
2017-05-16 10:02 ` Ævar Arnfjörð Bjarmason
2017-05-17 0:51 ` Junio C Hamano
2017-05-12 12:00 ` Junio C Hamano
2017-05-12 14:19 ` Johannes Schindelin
2017-05-12 17:38 ` Jonathan Nieder
2017-05-13 10:13 ` Junio C Hamano
2017-05-12 21:11 ` Junio C Hamano
2017-05-15 8:42 ` Johannes Schindelin
2017-05-12 9:11 ` Jeff King
2017-05-12 11:09 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201111151754.31527-3-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=peff@peff.net \
--cc=stefanbeller@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).