diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-09-06 19:25:23 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-06 13:23:22 -0700 |
| commit | e17dba8fe15028425acd6a4ebebf1b8e9377d3c6 (patch) | |
| tree | 77baffcf3748619adc2c02f68292103e4acc9165 /t | |
| parent | 871e293c9acbeaacce59dcd98fab6028f552f5be (diff) | |
| download | git-e17dba8fe15028425acd6a4ebebf1b8e9377d3c6.tar.gz git-e17dba8fe15028425acd6a4ebebf1b8e9377d3c6.tar.xz | |
remote: prefer subcommand name 'remove' to 'rm'
All remote subcommands are spelled out words except 'rm'. 'rm', being a
popular UNIX command name, may mislead users that there are also 'ls' or
'mv'. Use 'remove' to fit with the rest of subcommands.
'rm' is still supported and used in the test suite. It's just not
widely advertised.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5505-remote.sh | 4 | ||||
| -rwxr-xr-x | t/t5540-http-push.sh | 2 |
2 files changed, 3 insertions, 3 deletions
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) |