Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx> --- On Tue, Sep 08, 2009 at 12:15:13AM -0700, Josh Triplett wrote: > On Tue, Sep 08, 2009 at 12:02:42AM -0700, Junio C Hamano wrote: > > Josh Triplett <josh@xxxxxxxxxxxxxxxx> writes: > > > > > This configuration option allows systematically rewriting fetch-only > > > URLs to push-capable URLs when used with push. For instance: > > > > > > [url "ssh://example.org/"] > > > pushInsteadOf = "git://example.org/" > > > > > > This will allow clones of "git://example.org/path/to/repo" to > > > subsequently push to "ssh://example.org/path/to/repo", without manually > > > configuring pushurl for that remote. > > > > > > Includes documentation for the new option, bash completion updates, and > > > test cases (both that pushInsteadOf applies to push and that it does > > > *not* apply to fetch). > > > > Thanks. > > > > I will queue these patches, but I presume you would also want to add a > > test that pushInsteadOf is ignored for remotes with an explicit pushURL? > > Will do. Done. Please add this to the queue, optionally squashing it into patch 2/2 if you prefer. t/t5516-fetch-push.sh | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 8f455c7..6889a53 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -193,6 +193,22 @@ test_expect_success 'push with pushInsteadOf' ' ) ' +test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' ' + mk_empty && + TRASH="$(pwd)/" && + git config "url.trash2/.pushInsteadOf" trash/ && + git config remote.r.url trash/wrong && + git config remote.r.pushurl "$TRASH/testrepo" && + git push r refs/heads/master:refs/remotes/origin/master && + ( + cd testrepo && + r=$(git show-ref -s --verify refs/remotes/origin/master) && + test "z$r" = "z$the_commit" && + + test 1 = $(git for-each-ref refs/remotes/origin | wc -l) + ) +' + test_expect_success 'push with matching heads' ' mk_test heads/master && -- 1.6.3.3 -- 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