parse-remote: remove this now-unused library
The previous two commits removed the last use of a function in this library, but most of it had been dead code for a while[1][2]. Only the "get_default_remote" function was still being used. Even though we had a manual page for this library it was never intended (or I expect, actually) used outside of git.git. Let's just remove it, if anyone still cares about a function here they can pull them into their own project[3]. 1. Last use of error_on_missing_default_upstream():d03ebd411c("rebase: remove the rebase.useBuiltin setting", 2019-03-18) 2. Last use of get_remote_merge_branch():49eb8d39c7("Remove contrib/examples/*", 2018-03-25) 3. https://lore.kernel.org/git/87a6vmhdka.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
Junio C Hamano
parent
e63f7b0acb
commit
a89a2fbfcc
1
.gitignore
vendored
1
.gitignore
vendored
@ -114,7 +114,6 @@
|
||||
/git-pack-redundant
|
||||
/git-pack-objects
|
||||
/git-pack-refs
|
||||
/git-parse-remote
|
||||
/git-patch-id
|
||||
/git-prune
|
||||
/git-prune-packed
|
||||
|
||||
@ -1,23 +0,0 @@
|
||||
git-parse-remote(1)
|
||||
===================
|
||||
|
||||
NAME
|
||||
----
|
||||
git-parse-remote - Routines to help parsing remote repository access parameters
|
||||
|
||||
|
||||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'. "$(git --exec-path)/git-parse-remote"'
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
This script is included in various scripts to supply
|
||||
routines to parse files under $GIT_DIR/remotes/ and
|
||||
$GIT_DIR/branches/ and configuration variables that are related
|
||||
to fetching, pulling and pushing.
|
||||
|
||||
GIT
|
||||
---
|
||||
Part of the linkgit:git[1] suite
|
||||
2
Makefile
2
Makefile
@ -613,7 +613,6 @@ SCRIPT_SH += git-submodule.sh
|
||||
SCRIPT_SH += git-web--browse.sh
|
||||
|
||||
SCRIPT_LIB += git-mergetool--lib
|
||||
SCRIPT_LIB += git-parse-remote
|
||||
SCRIPT_LIB += git-rebase--preserve-merges
|
||||
SCRIPT_LIB += git-sh-i18n
|
||||
SCRIPT_LIB += git-sh-setup
|
||||
@ -2577,7 +2576,6 @@ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
|
||||
--keyword=__ --keyword=N__ --keyword="__n:1,2"
|
||||
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
|
||||
LOCALIZED_SH = $(SCRIPT_SH)
|
||||
LOCALIZED_SH += git-parse-remote.sh
|
||||
LOCALIZED_SH += git-rebase--preserve-merges.sh
|
||||
LOCALIZED_SH += git-sh-setup.sh
|
||||
LOCALIZED_PERL = $(SCRIPT_PERL)
|
||||
|
||||
@ -135,7 +135,6 @@ git-p4 foreignscminterface
|
||||
git-pack-objects plumbingmanipulators
|
||||
git-pack-redundant plumbinginterrogators
|
||||
git-pack-refs ancillarymanipulators
|
||||
git-parse-remote synchelpers
|
||||
git-patch-id purehelpers
|
||||
git-prune ancillarymanipulators complete
|
||||
git-prune-packed plumbingmanipulators
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
# This is a shell library to calculate the remote repository and
|
||||
# upstream branch that should be pulled by "git pull" from the current
|
||||
# branch.
|
||||
|
||||
# git-ls-remote could be called from outside a git managed repository;
|
||||
# this would fail in that case and would issue an error message.
|
||||
GIT_DIR=$(git rev-parse -q --git-dir) || :;
|
||||
|
||||
get_default_remote () {
|
||||
curr_branch=$(git symbolic-ref -q HEAD)
|
||||
curr_branch="${curr_branch#refs/heads/}"
|
||||
origin=$(git config --get "branch.$curr_branch.remote")
|
||||
echo ${origin:-origin}
|
||||
}
|
||||
|
||||
get_remote_merge_branch () {
|
||||
case "$#" in
|
||||
0|1)
|
||||
origin="$1"
|
||||
default=$(get_default_remote)
|
||||
test -z "$origin" && origin=$default
|
||||
curr_branch=$(git symbolic-ref -q HEAD) &&
|
||||
[ "$origin" = "$default" ] &&
|
||||
echo $(git for-each-ref --format='%(upstream)' $curr_branch)
|
||||
;;
|
||||
*)
|
||||
repo=$1
|
||||
shift
|
||||
ref=$1
|
||||
# FIXME: It should return the tracking branch
|
||||
# Currently only works with the default mapping
|
||||
case "$ref" in
|
||||
+*)
|
||||
ref=$(expr "z$ref" : 'z+\(.*\)')
|
||||
;;
|
||||
esac
|
||||
expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
|
||||
remote=$(expr "z$ref" : 'z\([^:]*\):')
|
||||
case "$remote" in
|
||||
'' | HEAD ) remote=HEAD ;;
|
||||
heads/*) remote=${remote#heads/} ;;
|
||||
refs/heads/*) remote=${remote#refs/heads/} ;;
|
||||
refs/* | tags/* | remotes/* ) remote=
|
||||
esac
|
||||
[ -n "$remote" ] && case "$repo" in
|
||||
.)
|
||||
echo "refs/heads/$remote"
|
||||
;;
|
||||
*)
|
||||
echo "refs/remotes/$repo/$remote"
|
||||
;;
|
||||
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
|
||||
}
|
||||
@ -20,7 +20,6 @@ USAGE="[--quiet] [--cached]
|
||||
OPTIONS_SPEC=
|
||||
SUBDIRECTORY_OK=Yes
|
||||
. git-sh-setup
|
||||
. git-parse-remote
|
||||
require_work_tree
|
||||
wt_prefix=$(git rev-parse --show-prefix)
|
||||
cd_to_toplevel
|
||||
|
||||
Loading…
Reference in New Issue
Block a user