diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-20 22:53:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-20 22:53:31 (GMT) |
| commit | f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4 (patch) | |
| tree | 1c680a7b5dffe18723b5a4a84d6475e14445b031 /t | |
| parent | f2fef7b55aea64104a6aee662817e1e6f0b22f71 (diff) | |
| parent | e17dba8fe15028425acd6a4ebebf1b8e9377d3c6 (diff) | |
| download | git-f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4.zip git-f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4.tar.gz git-f9c2d2b14e81d48d3d04f3bb01b1579ee359edb4.tar.bz2 | |
Merge branch 'nd/maint-remote-remove' into maint
* nd/maint-remote-remove:
remote: prefer subcommand name 'remove' to 'rm'
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 e8af615..c03ffdd 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 f141f2d..01d0d95 100755 --- a/t/t5540-http-push.sh +++ b/t/t5540-http-push.sh @@ -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) |