The --repo=myorigin option is supposed to change the default fallback remote from "origin" to "myorigin", but not override any direct argument nor config info of tracking branches. Add tests for this. (currently 2 known breakages) Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> --- Tap tap tap.... This is an R for Comments on the desired behaviour of git push with respect to --repo. I think the tests below expose that the current behaviour does not match the current doc. I'm messing around in the code but can't quite produce a match with the doc yet. Before investing more time I'm wondering whether the code should adjusted to the doc or vice versa... The code change I'm experimenting with right now is making default_remote_name a global and passing it from push. Does not look nice (esp. w.r.t. libification) but seems to ibe the minimally invasive solution. t/t5516-fetch-push.sh | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 89649e7..8393366 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -419,6 +419,41 @@ test_expect_success 'push with config remote.*.push = HEAD' ' git config --remove-section remote.there git config --remove-section branch.master +test_expect_success 'push with --repo=repourl from non-tracking branch' ' + + mk_test heads/master && + git push --repo=testrepo && + check_push_result $the_commit heads/master +' + +# set up fake remote config +test_expect_success 'push with --repo=remoterepo from non-tracking branch' ' + + mk_test heads/master && + git config remote.testremote.url testrepo && + git push --repo=testremote && + check_push_result $the_commit heads/master +' + +# set up fake tracking info; testrepo exists, origin does not. +test_expect_failure 'push with --repo=repo from tracking branch with bad config' ' + + mk_test heads/master && + git config branch.master.remote origin && + test_must_fail git push --repo=testrepo +' + +test_expect_failure 'push with --repo=repo from tracking branch with good config' ' + + mk_test heads/master && + git config branch.master.remote testrepo && + git push --repo=origin && + check_push_result $the_commit heads/master +' + +# clean up fake remote and tracking info +git config --unset-all branch.master.remote + test_expect_success 'push with dry-run' ' mk_test heads/master && -- 1.6.2.rc1.30.gd43c -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
