mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'nd/maint-remote-remove' into maint
* nd/maint-remote-remove: remote: prefer subcommand name 'remove' to 'rm'
This commit is contained in:
commit
f9c2d2b14e
|
@ -12,7 +12,7 @@ SYNOPSIS
|
|||
'git remote' [-v | --verbose]
|
||||
'git remote add' [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>
|
||||
'git remote rename' <old> <new>
|
||||
'git remote rm' <name>
|
||||
'git remote remove' <name>
|
||||
'git remote set-head' <name> (-a | -d | <branch>)
|
||||
'git remote set-branches' [--add] <name> <branch>...
|
||||
'git remote set-url' [--push] <name> <newurl> [<oldurl>]
|
||||
|
@ -85,6 +85,7 @@ In case <old> and <new> are the same, and <old> is a file under
|
|||
`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to
|
||||
the configuration file format.
|
||||
|
||||
'remove'::
|
||||
'rm'::
|
||||
|
||||
Remove the remote named <name>. All remote-tracking branches and
|
||||
|
|
|
@ -11,7 +11,7 @@ static const char * const builtin_remote_usage[] = {
|
|||
"git remote [-v | --verbose]",
|
||||
"git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>",
|
||||
"git remote rename <old> <new>",
|
||||
"git remote rm <name>",
|
||||
"git remote remove <name>",
|
||||
"git remote set-head <name> (-a | -d | <branch>)",
|
||||
"git remote [-v | --verbose] show [-n] <name>",
|
||||
"git remote prune [-n | --dry-run] <name>",
|
||||
|
@ -34,7 +34,7 @@ static const char * const builtin_remote_rename_usage[] = {
|
|||
};
|
||||
|
||||
static const char * const builtin_remote_rm_usage[] = {
|
||||
"git remote rm <name>",
|
||||
"git remote remove <name>",
|
||||
NULL
|
||||
};
|
||||
|
||||
|
@ -1580,7 +1580,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix)
|
|||
result = add(argc, argv);
|
||||
else if (!strcmp(argv[0], "rename"))
|
||||
result = mv(argc, argv);
|
||||
else if (!strcmp(argv[0], "rm"))
|
||||
else if (!strcmp(argv[0], "rm") || !strcmp(argv[0], "remove"))
|
||||
result = rm(argc, argv);
|
||||
else if (!strcmp(argv[0], "set-head"))
|
||||
result = set_head(argc, argv);
|
||||
|
|
|
@ -2040,7 +2040,7 @@ _git_config ()
|
|||
|
||||
_git_remote ()
|
||||
{
|
||||
local subcommands="add rename rm set-head set-branches set-url show prune update"
|
||||
local subcommands="add rename remove set-head set-branches set-url show prune update"
|
||||
local subcommand="$(__git_find_on_cmdline "$subcommands")"
|
||||
if [ -z "$subcommand" ]; then
|
||||
__gitcomp "$subcommands"
|
||||
|
@ -2048,7 +2048,7 @@ _git_remote ()
|
|||
fi
|
||||
|
||||
case "$subcommand" in
|
||||
rename|rm|set-url|show|prune)
|
||||
rename|remove|set-url|show|prune)
|
||||
__gitcomp_nl "$(__git_remotes)"
|
||||
;;
|
||||
set-head|set-branches)
|
||||
|
|
|
@ -125,7 +125,7 @@ EOF
|
|||
} &&
|
||||
git tag footag &&
|
||||
git config --add remote.oops.fetch "+refs/*:refs/*" &&
|
||||
git remote rm oops 2>actual1 &&
|
||||
git remote remove oops 2>actual1 &&
|
||||
git branch foobranch &&
|
||||
git config --add remote.oops.fetch "+refs/*:refs/*" &&
|
||||
git remote rm oops 2>actual2 &&
|
||||
|
@ -672,7 +672,7 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
|
|||
git clone one five &&
|
||||
origin_url=$(pwd)/one &&
|
||||
(cd five &&
|
||||
git remote rm origin &&
|
||||
git remote remove origin &&
|
||||
mkdir -p .git/remotes &&
|
||||
cat ../remotes_origin > .git/remotes/origin &&
|
||||
git remote rename origin origin &&
|
||||
|
|
|
@ -109,7 +109,7 @@ test_expect_success 'http-push fetches packed objects' '
|
|||
# By reset, we force git to retrieve the packed object
|
||||
(cd "$ROOT_PATH"/test_repo_clone_packed &&
|
||||
git reset --hard HEAD^ &&
|
||||
git remote rm origin &&
|
||||
git remote remove origin &&
|
||||
git reflog expire --expire=0 --all &&
|
||||
git prune &&
|
||||
git push -f -v $HTTPD_URL/dumb/test_repo_packed.git master)
|
||||
|
|
Loading…
Reference in a new issue