diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-12 21:21:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 21:21:58 (GMT) |
| commit | 90585604a72aaf56158069023dbcc6a61c6d7d50 (patch) | |
| tree | 9a13a38bfbe96699c56686e385793840bda6ee24 /t/t5505-remote.sh | |
| parent | 2cdfb602a4e4ca6896a2e0baf0b8d4424ad2f7aa (diff) | |
| parent | e17dba8fe15028425acd6a4ebebf1b8e9377d3c6 (diff) | |
| download | git-90585604a72aaf56158069023dbcc6a61c6d7d50.zip git-90585604a72aaf56158069023dbcc6a61c6d7d50.tar.gz git-90585604a72aaf56158069023dbcc6a61c6d7d50.tar.bz2 | |
Merge branch 'nd/maint-remote-remove'
* nd/maint-remote-remove:
remote: prefer subcommand name 'remove' to 'rm'
Diffstat (limited to 't/t5505-remote.sh')
| -rwxr-xr-x | t/t5505-remote.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 88a21ff..ccc55eb 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -131,7 +131,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 && @@ -678,7 +678,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 && |