diff options
| -rw-r--r-- | Documentation/git-remote.txt | 3 | ||||
| -rw-r--r-- | builtin/remote.c | 6 | ||||
| -rw-r--r-- | contrib/completion/git-completion.bash | 4 | ||||
| -rwxr-xr-x | t/t5505-remote.sh | 4 | ||||
| -rwxr-xr-x | t/t5540-http-push.sh | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index a308f4c79..e8c396b5f 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -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 diff --git a/builtin/remote.c b/builtin/remote.c index 920262d76..357d59d66 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -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); diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index ffedce751..ee4c0a07a 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2032,7 +2032,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" @@ -2040,7 +2040,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) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index e8af615e6..c03ffdde1 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -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 && diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh index 1eea64765..7c14bc481 100755 --- a/t/t5540-http-push.sh +++ b/t/t5540-http-push.sh @@ -117,7 +117,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) |